From d87dc137c60e55be3fea0654ce09a349906fec76 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 15 Oct 2006 05:59:02 +0000 Subject: [PATCH] Fix display of nomerge nodes and --tree for ROOT!=/. svn path=/main/trunk/; revision=4699 --- bin/emerge | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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: -- 2.26.2