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

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 847f7e5759ad93bad93681ac619716020dc24abf..95a4b0e73b8586b58bbb2724d4cdfa0c84f0aa2f 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2185,9 +2185,6 @@ class depgraph(object):
                        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=[]
@@ -2379,7 +2376,8 @@ class depgraph(object):
                        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."""