[patch] emerge_colorize_remove.diff

emerge_colorize_remove.diff (text/plain), 3.83 KB, created by Damien Thébault on 2006-06-30 10:42:50 UTC

--- /usr/bin/emerge.ori	2006-06-30 19:20:50.199941250 +0200
+++ /usr/bin/emerge	2006-06-30 19:31:35.856292250 +0200
@@ -27,7 +27,7 @@
 import portage
 
 import emergehelp, xpak, commands, errno, re, socket, string, time, types
-from output import blue, bold, colorize, darkblue, darkgreen, darkred, green, \
+from output import blue, bold, darkblue, darkgreen, darkred, green, \
 	havecolor, nc_len, nocolor, red, teal, turquoise, white, xtermTitle, \
 	xtermTitleReset, yellow
 
@@ -251,7 +251,7 @@
 		ticks=range(secs)
 		ticks.reverse()
 		for sec in ticks:
-			sys.stdout.write(colorize("WARN", str(sec+1)+" "))
+			sys.stdout.write(yellow(str(sec+1)+" "))
 			sys.stdout.flush()
 			time.sleep(1)
 		print
@@ -1970,7 +1970,7 @@
 							emergelog(xterm_titles,
 								" --- AUTOCLEAN: Nothing unmerged.")
 					else:
-						portage.writemsg_stdout(colorize("WARN", "WARNING:")
+						portage.writemsg_stdout(yellow("WARNING:")
 							+ " AUTOCLEAN is disabled.  This can cause serious"
 							+ " problems due to overlapping packages.\n")
 
@@ -2084,15 +2084,15 @@
 			ommitted_versions = "none"
 		portage.writemsg_stdout("\n %s\n" % bold(mycp), noiselevel=-1)
 		portage.writemsg_stdout("selected: ".rjust(14) + \
-			colorize("WARN", selected_versions) + "\n", noiselevel=-1)
+			yellow(selected_versions) + "\n", noiselevel=-1)
 		portage.writemsg_stdout("protected: ".rjust(14) + \
-			colorize("GOOD", protected_version) + "\n", noiselevel=-1)
+			green(protected_version) + "\n", noiselevel=-1)
 		portage.writemsg_stdout("omitted: ".rjust(14) + \
-			colorize("GOOD", ommitted_versions) + "\n", noiselevel=-1)
-		portage.writemsg_stdout("\n>>>" + colorize("WARN", "'Selected'") + \
+			green(ommitted_versions) + "\n", noiselevel=-1)
+		portage.writemsg_stdout("\n>>>" + yellow("'Selected'") + \
 			" packages are slated for removal.\n", noiselevel=0)
-		portage.writemsg_stdout(">>>" + colorize("GOOD", "'Protected'") + \
-			" and " + colorize("GOOD", "'omitted'") + \
+		portage.writemsg_stdout(">>>" + green("'Protected'") + \
+			" and " + green("'omitted'") + \
 			" packages will not be removed.\n\n",
 			noiselevel=0)
 		countdown(int(mysettings["CLEAN_DELAY"]), ">>> Unmerging")
@@ -2296,7 +2296,7 @@
 			print yellow("\a!!! Unmerging it may be damaging to your system.\n")
 			if "--pretend" not in myopts and "--ask" not in myopts:
 				countdown(int(settings["EMERGE_WARNING_DELAY"]),
-					colorize("WARN", "Press Ctrl-C to Stop"))
+					yellow("Press Ctrl-C to Stop"))
 		print "\n "+white(x)
 		for mytype in ["selected","protected","omitted"]:
 			print string.rjust(mytype,12)+":",
@@ -2308,18 +2308,16 @@
 					else:
 						myversion=mysplit[2]+"-"+mysplit[3]
 					if mytype=="selected":
-						portage.writemsg_stdout(colorize("WARN", myversion))
+						portage.writemsg_stdout(" " + yellow(myversion))
 					else:
-						portage.writemsg_stdout(colorize("GOOD", myversion))
+						portage.writemsg_stdout(" " + green(myversion))
 			else:
 					print "none",
 			print
-
-	portage.writemsg_stdout("\n>>> " + colorize("WARN", "'Selected'") + \
-		" packages are slated for removal.\n")
-	portage.writemsg_stdout(">>> " + colorize("GOOD", "'Protected'") + \
-			" and " + colorize("GOOD", "'omitted'") + \
-			" packages will not be removed.\n\n")
+	print "\n>>> " + yellow("'Selected'") + \
+		" packages are slated for removal."
+	print ">>> " + green("'Protected'") + " and " + green("'omitted'") + \
+		" packages will not be removed.\n"
 
 	if "--pretend" in myopts:
 		#we're done... return
@@ -3409,7 +3407,7 @@
 			vartree = trees[settings["ROOT"]]["vartree"]
 			unmerge(settings, myopts, vartree, "clean", ["world"])
 		else:
-			portage.writemsg_stdout(colorize("WARN", "WARNING:")
+			portage.writemsg_stdout(yellow("WARNING:")
 				+ " AUTOCLEAN is disabled.  This can cause serious"
 				+ " problems due to overlapping packages.\n")
 	if "--pretend" not in myopts: