diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-06 09:42:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-06 09:42:28 +0000 |
| commit | 2d5ea747d3f4f0ea61f84747066495f640de1567 (patch) | |
| tree | a2cdbff6ce6e0555416abc4bf5bfd6dc8cffacfc | |
| parent | 63e2bd7bdfa4697d0e8def48ad3b25b2f143dc96 (diff) | |
| download | portage-2d5ea747d3f4f0ea61f84747066495f640de1567.tar.gz portage-2d5ea747d3f4f0ea61f84747066495f640de1567.tar.bz2 portage-2d5ea747d3f4f0ea61f84747066495f640de1567.zip | |
tighten up --quiet output for --unmerge (trunk r7177)
svn path=/main/branches/2.1.2/; revision=7182
| -rwxr-xr-x | bin/emerge | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index c9ce08464..412028e70 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3989,9 +3989,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) @@ -4006,7 +4010,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'") + \ |