From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 14 Aug 2007 06:30:09 +0000 (-0000)
Subject: For bug #188782, keep "nomerge" nodes in the graph during the merge order calculation... 
X-Git-Tag: v2.2_pre1~887
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de884c6391426c3b9092475577a9fafdccb4c971;p=portage.git

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.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 847f7e575..95a4b0e73 100644
--- 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."""