summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-11-06 10:17:54 +0000
committerZac Medico <zmedico@gentoo.org>2006-11-06 10:17:54 +0000
commit7b89c862dd424112b4a8cacae0ae5b41d9ef07a3 (patch)
tree25d66148629b134bce286134d33707e315e9cd8e /bin/emerge
parent9ad4b520105e0ed3fc6b81091560a8de6a772134 (diff)
downloadportage-7b89c862dd424112b4a8cacae0ae5b41d9ef07a3.tar.gz
portage-7b89c862dd424112b4a8cacae0ae5b41d9ef07a3.tar.bz2
portage-7b89c862dd424112b4a8cacae0ae5b41d9ef07a3.zip
Make sure the node is still in the graph so that a KeyError can't happen.
svn path=/main/trunk/; revision=4953
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index 996924dcd..e6db286ed 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1520,6 +1520,9 @@ class depgraph:
if asap_nodes:
"""ASAP nodes are merged before their soft deps."""
for node in asap_nodes:
+ if not mygraph.contains(node):
+ asap_nodes.remove(node)
+ continue
if not mygraph.child_nodes(node,
ignore_priority=DepPriority.SOFT):
nodes = [node]