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

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

diff --git a/bin/emerge b/bin/emerge
index ce0163c050aa7d3b421459ef4bab03a61e9e4cc6..89cf55746abaea10b600609af35f2bcb5ae257b0 100755 (executable)
--- 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: