From 74c87ac635b3eebba28475762d1e79c55f2c44e3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 14 Feb 2007 22:49:06 +0000 Subject: Optimize merge order calculation for --tree output when necessary. (trunk r5967) svn path=/main/branches/2.1.2/; revision=5968 --- bin/emerge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin') 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. -- cgit v1.2.3-1-g7c22