add --quiet support to --cols

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

diff --git a/bin/emerge b/bin/emerge
index 3bbbfe3a6bf068983ca1b44b8ced34b5dc2af7dc..b4513a8c14eca92cb733a22b665d248dfa191d94 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1693,25 +1693,36 @@ class depgraph:
 
                                if x[1]!="/":
                                        if "--columns" in myopts:
-                                               myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
-                                               if (newlp-nc_len(myprint)) > 0:
-                                                       myprint=myprint+(" "*(newlp-nc_len(myprint)))
-                                               myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] "
-                                               if (oldlp-nc_len(myprint)) > 0:
-                                                       myprint=myprint+" "*(oldlp-nc_len(myprint))
-                                               myprint=myprint+myoldbest
-                                               myprint=myprint+darkgreen("  to "+x[1])+" "+verboseadd
+                                               if "--quiet" in myopts:
+                                                       myprint=addl+" "+indent+darkgreen(xs[0])
+                                                       myprint=myprint+darkblue(xs[1]+xs[2])+" "
+                                                       myprint=myprint+myoldbest
+                                                       myprint=myprint+darkgreen(" to "+x[1])
+                                               else:
+                                                       myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
+                                                       if (newlp-nc_len(myprint)) > 0:
+                                                               myprint=myprint+(" "*(newlp-nc_len(myprint)))
+                                                       myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] "
+                                                       if (oldlp-nc_len(myprint)) > 0:
+                                                               myprint=myprint+" "*(oldlp-nc_len(myprint))
+                                                       myprint=myprint+myoldbest
+                                                       myprint=myprint+darkgreen("  to "+x[1])+" "+verboseadd
                                        else:
                                                myprint="["+x[0]+" "+addl+"] "+darkgreen(x[2])+" "+myoldbest+" "+darkgreen("to "+x[1])+" "+verboseadd
                                else:
                                        if "--columns" in myopts:
-                                               myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
-                                               if (newlp-nc_len(myprint)) > 0:
-                                                       myprint=myprint+(" "*(newlp-nc_len(myprint)))
-                                               myprint=myprint+green(" ["+xs[1]+xs[2]+"] ")
-                                               if (oldlp-nc_len(myprint)) > 0:
-                                                       myprint=myprint+(" "*(oldlp-nc_len(myprint)))
-                                               myprint=myprint+myoldbest+"  "+verboseadd
+                                               if "--quiet" in myopts:
+                                                       myprint=addl+" "+indent+darkgreen(xs[0])
+                                                       myprint=myprint+" "+green(xs[1]+xs[2])
+                                                       myprint=myprint+myoldbest
+                                               else:
+                                                       myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
+                                                       if (newlp-nc_len(myprint)) > 0:
+                                                               myprint=myprint+(" "*(newlp-nc_len(myprint)))
+                                                       myprint=myprint+green(" ["+xs[1]+xs[2]+"] ")
+                                                       if (oldlp-nc_len(myprint)) > 0:
+                                                               myprint=myprint+(" "*(oldlp-nc_len(myprint)))
+                                                       myprint=myprint+myoldbest+"  "+verboseadd
                                        else:
                                                if x[3]=="nomerge":
                                                        myprint=darkblue("[nomerge      ] "+indent+x[2]+" "+myoldbest+" ")+verboseadd