diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-14 22:48:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-14 22:48:37 +0000 |
| commit | 0d208d7bace79f104c95b0438eb27885a64906ac (patch) | |
| tree | fe6c7c7f18822e1dfedfd0fffc0fc9dad3e86e4e | |
| parent | 62adef819a460f68cf9bcdfa4f9fdc2db3edb5fd (diff) | |
| download | portage-0d208d7bace79f104c95b0438eb27885a64906ac.tar.gz portage-0d208d7bace79f104c95b0438eb27885a64906ac.tar.bz2 portage-0d208d7bace79f104c95b0438eb27885a64906ac.zip | |
Optimize merge order calculation for --tree output when necessary.
svn path=/main/trunk/; revision=5967
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index f0809ab39..59652958e 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1987,6 +1987,7 @@ class depgraph: ignore_priority_range = [None] ignore_priority_range.extend( xrange(DepPriority.MIN, DepPriority.MEDIUM + 1)) + tree_mode = "--tree" in self.myopts while not mygraph.empty(): ignore_priority = None nodes = None @@ -2009,7 +2010,7 @@ class depgraph: selected_nodes = None if nodes: if ignore_priority <= DepPriority.SOFT: - if ignore_priority is None and not reversed: + if ignore_priority is None and not tree_mode: # Greedily pop all of these nodes since no relationship # has been ignored. This optimization destroys --tree # output, so it's disabled in reversed mode. |