summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-15 00:36:20 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-15 00:36:20 +0000
commitda7b4aa5aebdbb3a6a7c4ee04b672d6258d0540d (patch)
treec679a49d1f5d13081603311761dba87fc927c3be /bin
parentb68439b4999871c72a1b7566baa75fc6061f8527 (diff)
downloadportage-da7b4aa5aebdbb3a6a7c4ee04b672d6258d0540d.tar.gz
portage-da7b4aa5aebdbb3a6a7c4ee04b672d6258d0540d.tar.bz2
portage-da7b4aa5aebdbb3a6a7c4ee04b672d6258d0540d.zip
add --quiet support to --cols
svn path=/main/trunk/; revision=2891
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge41
1 files changed, 26 insertions, 15 deletions
diff --git a/bin/emerge b/bin/emerge
index 3bbbfe3a6..b4513a8c1 100755
--- 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