aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-09-08 08:13:34 +0000
committerZac Medico <zmedico@gentoo.org>2007-09-08 08:13:34 +0000
commit4d626832602466516068d0e0ea867890816b074c (patch)
treedf728cc2b7311366fb6d87efc176ab7683781f3e
parentBug #190268 - Avoid unwanted sandbox violations in src_test(). (diff)
downloadportage-2.1.3.9.tar.gz
portage-2.1.3.9.tar.bz2
portage-2.1.3.9.zip
In depgraph.altlist(), try to merge asap_nodes sooner by giving them an exemption from the accept_root_node flag.v2.1.3.9
svn path=/main/branches/2.1.2/; revision=7762
-rwxr-xr-xbin/emerge3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index 93f8f85fd..d7c884743 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2382,7 +2382,8 @@ class depgraph:
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()