summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-14 07:03:24 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-14 07:03:24 +0000
commite6263c13b92bc0329a471eeb5d72fea9a7fe7b07 (patch)
treedd6996b53a734e03575205962f422285fce98aa7
parent4444f0081e07c25296ef4ddcc6de0db3451dc47d (diff)
downloadportage-e6263c13b92bc0329a471eeb5d72fea9a7fe7b07.tar.gz
portage-e6263c13b92bc0329a471eeb5d72fea9a7fe7b07.tar.bz2
portage-e6263c13b92bc0329a471eeb5d72fea9a7fe7b07.zip
Remove redundant priority handling since that's always handled in select_dep() for nodes that have parents.
svn path=/main/trunk/; revision=5292
-rwxr-xr-xbin/emerge7
1 files changed, 2 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge
index 8505f7645..0f00b7d0f 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -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))