diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-07-01 20:07:17 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-07-01 20:07:17 +0000 |
commit | 43f9fbafb97c370743e2959bcd95712abc4c0753 (patch) | |
tree | 02b025468af566ccb4f55564eae58297f525c02b | |
parent | d73377de6a57c92d9490d2d995eecccf01e63286 (diff) | |
download | portage-43f9fbafb97c370743e2959bcd95712abc4c0753.tar.gz portage-43f9fbafb97c370743e2959bcd95712abc4c0753.tar.bz2 portage-43f9fbafb97c370743e2959bcd95712abc4c0753.zip |
If necessary, resample the leaf nodes so that they include all nodes whose hard deps are satisfied. (trunk r7116)
svn path=/main/branches/2.1.2/; revision=7117
-rwxr-xr-x | bin/emerge | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index bf33f5839..be9184066 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2124,6 +2124,10 @@ class depgraph: mergeable_nodes, selected_nodes, child): return False return True + # If necessary, resample the leaf nodes so that they + # include all nodes whose hard deps are satisfied. + if ignore_priority < DepPriority.MEDIUM: + nodes = get_nodes(ignore_priority=DepPriority.MEDIUM) mergeable_nodes = set(nodes) for ignore_priority in xrange(DepPriority.SOFT, DepPriority.MEDIUM_SOFT + 1): @@ -2151,6 +2155,8 @@ class depgraph: for child in medium_soft: if child in selected_nodes: continue + if child in asap_nodes: + continue # TODO: Try harder to make these nodes get # merged absolutely as soon as possible. asap_nodes.append(child) |