| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-02 20:16:06 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10102 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Use Package.cp attribute instead of calling cpv_getkey(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-02 20:02:45 UTC (rev 10101) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-02 20:16:06 UTC (rev 10102) |
| 15 |
@@ -3439,13 +3439,16 @@ |
| 16 |
return [node for node in mygraph.leaf_nodes(**kwargs) \ |
| 17 |
if isinstance(node, Package) and \ |
| 18 |
node.operation != "uninstall"] |
| 19 |
- if True: |
| 20 |
- for node in mygraph.order: |
| 21 |
- if node.root == "/" and \ |
| 22 |
- "sys-apps/portage" == portage.cpv_getkey(node.cpv): |
| 23 |
- portage_node = node |
| 24 |
- asap_nodes.append(node) |
| 25 |
- break |
| 26 |
+ |
| 27 |
+ # sys-apps/portage needs special treatment if ROOT="/" |
| 28 |
+ for node in mygraph.order: |
| 29 |
+ if isinstance(node, Package) and \ |
| 30 |
+ "sys-apps/portage" == node.cp and \ |
| 31 |
+ "/" == node.root: |
| 32 |
+ portage_node = node |
| 33 |
+ asap_nodes.append(node) |
| 34 |
+ break |
| 35 |
+ |
| 36 |
ignore_priority_soft_range = [None] |
| 37 |
ignore_priority_soft_range.extend( |
| 38 |
xrange(DepPriority.MIN, DepPriority.MEDIUM_SOFT + 1)) |
| 39 |
|
| 40 |
-- |
| 41 |
gentoo-commits@l.g.o mailing list |
Archives