From c090fec963d081df9e491ec3c5a0745440202f82 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 14 Aug 2007 19:04:00 +0000 Subject: [PATCH] Merged from trunk 7598:7599 | 7599 | For bug #188782, keep "nomerge" nodes in the graph during | | zmedico | the merge order calculation so that merge order is better in | | | cases where installed packages have unsatisfied | | | dependencies. | svn path=/main/branches/prefix/; revision=7601 --- pym/emerge/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 413f7d5d5..3c7e532c7 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2186,9 +2186,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=[] @@ -2380,7 +2377,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.""" -- 2.26.2