From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 15 Oct 2006 05:59:02 +0000 (-0000)
Subject: Fix display of nomerge nodes and --tree for ROOT!=/.
X-Git-Tag: v2.1.2~634
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d87dc137c60e55be3fea0654ce09a349906fec76;p=portage.git

Fix display of nomerge nodes and --tree for ROOT!=/.

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

diff --git a/bin/emerge b/bin/emerge
index ce0163c05..89cf55746 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1927,7 +1927,13 @@ class depgraph:
 							myprint=myprint+myoldbest
 							myprint=myprint+darkgreen("to "+x[1])+" "+verboseadd
 					else:
-						myprint="["+x[0]+" "+addl+"] "+darkgreen(x[2])+" "+myoldbest+darkgreen("to "+x[1])+" "+verboseadd
+						if x[3] == "nomerge":
+							myprint = darkblue("[nomerge      ] ")
+						else:
+							myprint = "[" + pkg_type + " " + addl + "] "
+						myprint += indent + darkgreen(pkg_key) + " " + \
+							myoldbest + darkgreen("to " + myroot) + " " + \
+							verboseadd
 				else:
 					if "--columns" in self.myopts:
 						if "--quiet" in self.myopts: