summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-15 05:59:02 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-15 05:59:02 +0000
commitd87dc137c60e55be3fea0654ce09a349906fec76 (patch)
tree8074177d48da2a8c9bcd9d4c0600545891329602
parent2ff5c8a4de2e979d399763aa364b2b80dd794e15 (diff)
downloadportage-d87dc137c60e55be3fea0654ce09a349906fec76.tar.gz
portage-d87dc137c60e55be3fea0654ce09a349906fec76.tar.bz2
portage-d87dc137c60e55be3fea0654ce09a349906fec76.zip
Fix display of nomerge nodes and --tree for ROOT!=/.
svn path=/main/trunk/; revision=4699
-rwxr-xr-xbin/emerge8
1 files changed, 7 insertions, 1 deletions
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: