From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 14 Feb 2007 22:48:37 +0000 (-0000)
Subject: Optimize merge order calculation for --tree output when necessary.
X-Git-Tag: v2.2_pre1~1706
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d208d7bace79f104c95b0438eb27885a64906ac;p=portage.git

Optimize merge order calculation for --tree output when necessary.

svn path=/main/trunk/; revision=5967
---

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.