Fix Scheduler._dependent_on_scheduled_merges() to properly distinguish

"nomerge" nodes from "uninstall" nodes.

svn path=/main/trunk/; revision=10991

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 4f43b0fd29f92cc05af9fbda91dd25037f2de87f..e9ad9f2c1bc9fbb364b16d7679bc2467254e5b11 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8138,7 +8138,7 @@ class Scheduler(object):
                        if node in traversed_nodes:
                                continue
                        traversed_nodes.add(node)
-                       if not node.installed and \
+                       if not (node.installed and node.operation == "nomerge") and \
                                node not in completed_tasks:
                                dependent = True
                                break