summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-07-06 04:47:38 +0000
committerMike Frysinger <vapier@gentoo.org>2007-07-06 04:47:38 +0000
commit408e9f44344e597e9ec1ad2fa09821c104f6a52a (patch)
tree2db23c6138c70ee84ac17935ed2fc3097db193cf
parent75aced724ee3a2a09edd3501633ce5316f2418a9 (diff)
downloadportage-408e9f44344e597e9ec1ad2fa09821c104f6a52a.tar.gz
portage-408e9f44344e597e9ec1ad2fa09821c104f6a52a.tar.bz2
portage-408e9f44344e597e9ec1ad2fa09821c104f6a52a.zip
tighten up --quiet output for --unmerge
svn path=/main/trunk/; revision=7177
-rw-r--r--pym/emerge/__init__.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index ffd426893..9372a1dd3 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4038,9 +4038,13 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
if "--pretend" not in myopts and "--ask" not in myopts:
countdown(int(settings["EMERGE_WARNING_DELAY"]),
colorize("UNMERGE_WARN", "Press Ctrl-C to Stop"))
- print "\n "+white(x)
+ if "--quiet" not in myopts:
+ print "\n "+white(x)
+ else:
+ print white(x)+": ",
for mytype in ["selected","protected","omitted"]:
- portage.writemsg_stdout((mytype + ": ").rjust(14), noiselevel=-1)
+ if "--quiet" not in myopts:
+ portage.writemsg_stdout((mytype + ": ").rjust(14), noiselevel=-1)
if pkgmap[x][mytype]:
for mypkg in pkgmap[x][mytype]:
mysplit=portage.catpkgsplit(mypkg)
@@ -4055,7 +4059,10 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
portage.writemsg_stdout(
colorize("GOOD", myversion + " "), noiselevel=-1)
else:
- portage.writemsg_stdout("none", noiselevel=-1)
+ portage.writemsg_stdout("none ", noiselevel=-1)
+ if "--quiet" not in myopts:
+ portage.writemsg_stdout("\n", noiselevel=-1)
+ if "--quiet" in myopts:
portage.writemsg_stdout("\n", noiselevel=-1)
portage.writemsg_stdout("\n>>> " + colorize("UNMERGE_WARN", "'Selected'") + \