Optimize merge order calculation for --tree output when necessary. (trunk r5967)

svn path=/main/branches/2.1.2/; revision=5968

diff --git a/bin/emerge b/bin/emerge
index 1acbfe71de5d9fd356d4b66b09127f22004250a1..33db36435fd4ec07264004aaf0a40255b522a081 100755 (executable)
--- 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.