From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 9 Jul 2008 01:46:24 +0000 (-0000)
Subject: Fix _prune_digraph() to correctly distinguish "nomerge" nodes from
X-Git-Tag: v2.2_rc2~146
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ade72eb9c45b38c3d1bf8e68de88854563eea033;p=portage.git

Fix _prune_digraph() to correctly distinguish "nomerge" nodes from
"uninstall" nodes.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 8ef659ab5..cd43593de 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7723,7 +7723,8 @@ class Scheduler(object):
 		while True:
 			for node in graph.root_nodes():
 				if not isinstance(node, Package) or \
-					node.installed or node.onlydeps or \
+					(node.installed and node.operation == "nomerge") or \
+					node.onlydeps or \
 					node in completed_tasks:
 					removed_nodes.add(node)
 			if removed_nodes: