diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-14 22:49:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-14 22:49:06 +0000 |
| commit | 74c87ac635b3eebba28475762d1e79c55f2c44e3 (patch) | |
| tree | bb3acee5b43e846363235d693bdcef93c03b8dbe /bin | |
| parent | 5e177c8b87154ebc12b46a666ae6116bc164eaed (diff) | |
| download | portage-74c87ac635b3eebba28475762d1e79c55f2c44e3.tar.gz portage-74c87ac635b3eebba28475762d1e79c55f2c44e3.tar.bz2 portage-74c87ac635b3eebba28475762d1e79c55f2c44e3.zip | |
Optimize merge order calculation for --tree output when necessary. (trunk r5967)
svn path=/main/branches/2.1.2/; revision=5968
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 1acbfe71d..33db36435 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1984,6 +1984,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 @@ -2006,7 +2007,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. |