Make sure the node is still in the graph so that a KeyError can't happen.
authorZac Medico <zmedico@gentoo.org>
Mon, 6 Nov 2006 10:17:54 +0000 (10:17 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 6 Nov 2006 10:17:54 +0000 (10:17 -0000)
svn path=/main/trunk/; revision=4953

bin/emerge

index 996924dcdec75d2b7d2e7710a17bb2c8cee23e64..e6db286ed311712399ece7ea80e12d6769341ef9 100755 (executable)
@@ -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]