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

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

svn path=/main/branches/2.1.2/; revision=10099
---

diff --git a/bin/emerge b/bin/emerge
index af42ebfa5..9e3226548 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3940,6 +3940,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.
@@ -3973,8 +3976,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: