diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-18 20:45:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-18 20:45:14 +0000 |
| commit | a891ec595a09ff14366b7ca13b24a340ed44f10b (patch) | |
| tree | df379754c9dfdd3831cd60012fff1452dbcc371b /pym | |
| parent | e30c257c1721851e6fadc141235184758727440f (diff) | |
| download | portage-a891ec595a09ff14366b7ca13b24a340ed44f10b.tar.gz portage-a891ec595a09ff14366b7ca13b24a340ed44f10b.tar.bz2 portage-a891ec595a09ff14366b7ca13b24a340ed44f10b.zip | |
For bug #167450, optimize merge order by delaying the merge of root nodes.
svn path=/main/trunk/; revision=5996
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/emerge/__init__.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 96bad6761..6d3993266 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2025,8 +2025,18 @@ class depgraph: # output, so it's disabled in reversed mode. selected_nodes = nodes else: - # Only pop one node for optimal merge order. - selected_nodes = [nodes[0]] + # For optimal merge order: + # * Only pop one node. + # * Removing a root node (node without a parent) + # will not produce a leaf node, so avoid it. + for node in nodes: + if mygraph.parent_nodes(node): + # found a non-root node + selected_nodes = [node] + break + if not selected_nodes: + # settle for a root node + selected_nodes = [nodes[0]] else: """Recursively gather a group of nodes that RDEPEND on eachother. This ensures that they are merged as a group |