tighten up --quiet output for --unmerge (trunk r7177)

svn path=/main/branches/2.1.2/; revision=7182

diff --git a/bin/emerge b/bin/emerge
index c9ce08464f0e73b1499564ba4e3a52e92a3a7f46..412028e70491d16adfcc69bfb617c3ef298c82f7 100755 (executable)
--- 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'") + \