From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 6 Jul 2007 09:42:28 +0000 (-0000)
Subject: tighten up --quiet output for --unmerge (trunk r7177)
X-Git-Tag: v2.1.3~84
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d5ea747d3f4f0ea61f84747066495f640de1567;p=portage.git

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 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'") + \