From 482c76bbd94c6280e8f352e4e458d9ec2e40e658 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 8 Jul 2008 22:19:21 +0000 Subject: Fix Scheduler._dependent_on_scheduled_merges() to properly distinguish "nomerge" nodes from "uninstall" nodes. svn path=/main/trunk/; revision=10991 --- pym/_emerge/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 4f43b0fd2..e9ad9f2c1 100644 --- 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 -- cgit v1.2.3-1-g7c22