For bug #188782, keep "nomerge" nodes in the graph during the merge order calculation...

svn path=/main/branches/2.1.2.9/; revision=7618

diff --git a/bin/emerge b/bin/emerge
index 0f75d7d35ff087749f118a751645e524bb98fe83..79437f1e276c3480cce86d08167102b55d10bd89 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2008,9 +2008,6 @@ class depgraph:
                        self._altlist_cache[reversed] = retlist[:]
                        return retlist
                mygraph=self.digraph.copy()
-               for node in mygraph.order[:]:
-                       if node[-1] == "nomerge":
-                               mygraph.remove(node)
                self._merge_order_bias(mygraph)
                myblockers = self.blocker_digraph.copy()
                retlist=[]
@@ -2202,7 +2199,8 @@ class depgraph:
                        prefer_asap = True
 
                        for node in selected_nodes:
-                               retlist.append(list(node))
+                               if node[-1] != "nomerge":
+                                       retlist.append(list(node))
                                mygraph.remove(node)
                                if not reversed and not circular_blocks and myblockers.contains(node):
                                        """This node may have invalidated one or more blockers."""