From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 4 May 2008 03:27:10 +0000 (-0000)
Subject: Fix some unwanted interaction between --tree display and unsatisfied
X-Git-Tag: v2.1.5~70
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff984554d2046dedc1e12a616c479b6284161db2;p=portage.git

Fix some unwanted interaction between --tree display and unsatisfied
blockers in depgraph.display(). (trunk r10155)

svn path=/main/branches/2.1.2/; revision=10156
---

diff --git a/bin/emerge b/bin/emerge
index e5d7db304..65a582102 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4194,10 +4194,17 @@ class depgraph(object):
 					if parent != inst_pkg:
 						mygraph.add(blocker, parent)
 
+		tree = "--tree" in self.myopts
+		
+
+		unsatisfied_blockers = []
 		i = 0
 		depth = 0
 		shown_edges = set()
 		for x in mylist:
+			if isinstance(x, Blocker) and not x.satisfied:
+				unsatisfied_blockers.append(x)
+				continue
 			graph_key = x
 			if "--tree" in self.myopts:
 				depth = len(tree_nodes)
@@ -4256,6 +4263,8 @@ class depgraph(object):
 			else:
 				display_list.append((x, depth, True))
 		mylist = display_list
+		for x in unsatisfied_blockers:
+			mylist.append((x, 0, True))
 
 		last_merge_depth = 0
 		for i in xrange(len(mylist)-1,-1,-1):