From 3543fe1cbabe5e163e817b5f2f86305b95232b17 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 15 Aug 2007 20:37:47 +0000 Subject: [PATCH] For bug #188782, keep "nomerge" nodes in the graph during the merge order calculation so that merge order is better in cases where installed packages have unsatisfied dependencies. (branches/2.1.2 r7600) svn path=/main/branches/2.1.2.9/; revision=7618 --- bin/emerge | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/emerge b/bin/emerge index 0f75d7d35..79437f1e2 100755 --- 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.""" -- 2.26.2