From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 May 2008 19:20:29 +0000 (-0000)
Subject: In depgraph._serialize_tasks(), filter "nomerge" nodes at a more appropriate
X-Git-Tag: v2.2_pre6~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e79f785a5ae93d042275508f3e1ac8078e24842;p=portage.git

In depgraph._serialize_tasks(), filter "nomerge" nodes at a more appropriate
place.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 506255087..a988c6bac 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3793,6 +3793,9 @@ class depgraph(object):
 			mygraph.difference_update(selected_nodes)
 
 			for node in selected_nodes:
+				if isinstance(node, Package) and \
+					node.operation == "nomerge":
+					continue
 
 				# Handle interactions between blockers
 				# and uninstallation tasks.
@@ -3826,8 +3829,7 @@ class depgraph(object):
 							myblocker_uninstalls.remove(blocker)
 							solved_blockers.add(blocker)
 
-				if node[-1] != "nomerge":
-					retlist.append(node)
+				retlist.append(node)
 
 				if isinstance(node, Package) and \
 					"uninstall" == node.operation: