diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-02 20:17:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-02 20:17:04 +0000 |
| commit | 0fb4e3ffd952dd7079fec55339ff6b0d427fdbd0 (patch) | |
| tree | 47938ce70137bd366e6828d563747f7dc49286b2 /bin | |
| parent | 315cf2e2ba0d2c007a4778dbba38b5281d3cbabf (diff) | |
| download | portage-0fb4e3ffd952dd7079fec55339ff6b0d427fdbd0.tar.gz portage-0fb4e3ffd952dd7079fec55339ff6b0d427fdbd0.tar.bz2 portage-0fb4e3ffd952dd7079fec55339ff6b0d427fdbd0.zip | |
Use Package.cp attribute instead of calling cpv_getkey(). (trunk r10102)
svn path=/main/branches/2.1.2/; revision=10103
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge index 5fee6a227..38997c2e0 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3586,13 +3586,16 @@ class depgraph(object): return [node for node in mygraph.leaf_nodes(**kwargs) \ if isinstance(node, Package) and \ node.operation != "uninstall"] - if True: - for node in mygraph.order: - if node.root == "/" and \ - "sys-apps/portage" == portage.cpv_getkey(node.cpv): - portage_node = node - asap_nodes.append(node) - break + + # sys-apps/portage needs special treatment if ROOT="/" + for node in mygraph.order: + if isinstance(node, Package) and \ + "sys-apps/portage" == node.cp and \ + "/" == node.root: + portage_node = node + asap_nodes.append(node) + break + ignore_priority_soft_range = [None] ignore_priority_soft_range.extend( xrange(DepPriority.MIN, DepPriority.MEDIUM_SOFT + 1)) |