Use Package.cp attribute instead of calling cpv_getkey(). (trunk r10102)

svn path=/main/branches/2.1.2/; revision=10103

diff --git a/bin/emerge b/bin/emerge
index 5fee6a227e8f6d404cfef8556d3a22ef8a669706..38997c2e084d1f0674523e91916256d961a04651 100755 (executable)
--- 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))