summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-07-08 22:19:21 +0000
committerZac Medico <zmedico@gentoo.org>2008-07-08 22:19:21 +0000
commit482c76bbd94c6280e8f352e4e458d9ec2e40e658 (patch)
treed571cff229a0fd4adb872e97f510ccc6911c4d1f
parenta236dfffc84a00e55a4deda2e9c34788d30de9eb (diff)
downloadportage-482c76bbd94c6280e8f352e4e458d9ec2e40e658.tar.gz
portage-482c76bbd94c6280e8f352e4e458d9ec2e40e658.tar.bz2
portage-482c76bbd94c6280e8f352e4e458d9ec2e40e658.zip
Fix Scheduler._dependent_on_scheduled_merges() to properly distinguish
"nomerge" nodes from "uninstall" nodes. svn path=/main/trunk/; revision=10991
-rw-r--r--pym/_emerge/__init__.py2
1 files changed, 1 insertions, 1 deletions
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