[patch] improve merge order for cases where installed packages have unsatisfied dependencies

installed_unsatisfied.patch (text/plain), 791 bytes, created by Zac Medico on 2007-08-14 06:33:07 UTC

Index: bin/emerge
===================================================================
--- bin/emerge	(revision 7599)
+++ bin/emerge	(revision 7600)
@@ -2237,9 +2237,6 @@
 			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=[]
@@ -2431,7 +2428,8 @@
 			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."""