summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-09-08 08:33:02 +0000
committerZac Medico <zmedico@gentoo.org>2007-09-08 08:33:02 +0000
commitb419bafe835fd45e3010b385fc7981e99e5a228b (patch)
tree83f952984c4a7df7afa9f67882aaf9b6219a2732
parent21fbc5617d18d00abe190aeb5b4b6b33f5cf876b (diff)
downloadportage-b419bafe835fd45e3010b385fc7981e99e5a228b.tar.gz
portage-b419bafe835fd45e3010b385fc7981e99e5a228b.tar.bz2
portage-b419bafe835fd45e3010b385fc7981e99e5a228b.zip
In depgraph.altlist(), try to merge asap_nodes sooner by giving them an exemption from the accept_root_node flag. (branches/2.1.2 r7762)
svn path=/main/trunk/; revision=7763
-rw-r--r--pym/emerge/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 963e98141..9cd10a1ed 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2334,7 +2334,8 @@ class depgraph(object):
for ignore_priority in xrange(DepPriority.SOFT,
DepPriority.MEDIUM_SOFT + 1):
for node in nodes:
- if not accept_root_node and \
+ if nodes is not asap_nodes and \
+ not accept_root_node and \
not mygraph.parent_nodes(node):
continue
selected_nodes = set()