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 8ef659ab54b402a768be08add711e78f1d695978..cd43593de064e3dab2080a356765feae7ea63202 100644 (file)
--- 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: