When unable to navigate around blockers, add them back to the main digraph so that...

svn path=/main/trunk/; revision=4726

diff --git a/bin/emerge b/bin/emerge
index 4d700ef19d0ba74c3f8a149ac8d37972920e4d73..86bf640b08d212fdbb333b705954805973c9b4b3 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1457,8 +1457,10 @@ class depgraph:
                                                if not myblockers.child_nodes(blocker):
                                                        myblockers.remove(blocker)
 
-               if not myblockers.is_empty():
-                       retlist.extend([node.split() for node in myblockers.root_nodes()])
+               for node in myblockers.root_nodes():
+                       retlist.append(node.split())
+                       for parent in self.blocker_parents[node]:
+                               self.digraph.add(node, parent)
 
                return retlist