Remove redundant priority handling since that's always handled in select_dep() for...
authorZac Medico <zmedico@gentoo.org>
Thu, 14 Dec 2006 07:03:24 +0000 (07:03 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 14 Dec 2006 07:03:24 +0000 (07:03 -0000)
svn path=/main/trunk/; revision=5292

bin/emerge

index 8505f76453c6407cfc532ee58691f096d3f28968..0f00b7d0fa0f87926b738ec5350522c136971cce 100755 (executable)
@@ -991,16 +991,13 @@ class depgraph:
                                e_type, myroot, e_cpv, e_status = existing_node
                                if mykey == e_cpv:
                                        # The existing node can be reused.
-                                       mypriority = priority.copy()
-                                       if vardbapi.cpv_exists(e_cpv):
-                                               mypriority.satisfied = True
                                        if rev_dep and myparent:
                                                ptype, proot, pkey, pstatus = myparent
                                                self.digraph.addnode(myparent, existing_node,
-                                                       priority=mypriority)
+                                                       priority=priority)
                                        else:
                                                self.digraph.addnode(existing_node, myparent,
-                                                       priority=mypriority)
+                                                       priority=priority)
                                        return 1
                                else:
                                        self._show_slot_collision_notice((mykey, e_cpv))