Attachment #90541 for bug #138600




import portage

import emergehelp, xpak, commands, errno, re, socket, string, time, types
from output import blue, bold, darkblue, darkgreen, darkred, green, \
	havecolor, nc_len, nocolor, red, teal, turquoise, white, xtermTitle, \
	xtermTitleReset, yellow


		ticks=range(secs)
		ticks.reverse()
		for sec in ticks:
			sys.stdout.write(yellow(str(sec+1)+" "))
			sys.stdout.flush()
			time.sleep(1)
		print

							emergelog(xterm_titles,
								" --- AUTOCLEAN: Nothing unmerged.")
					else:
						portage.writemsg_stdout(yellow("WARNING:")
							+ " AUTOCLEAN is disabled.  This can cause serious"
							+ " problems due to overlapping packages.\n")


			ommitted_versions = "none"
		portage.writemsg_stdout("\n %s\n" % bold(mycp), noiselevel=-1)
		portage.writemsg_stdout("selected: ".rjust(14) + \
			yellow(selected_versions) + "\n", noiselevel=-1)
		portage.writemsg_stdout("protected: ".rjust(14) + \
			green(protected_version) + "\n", noiselevel=-1)
		portage.writemsg_stdout("omitted: ".rjust(14) + \
			green(ommitted_versions) + "\n", noiselevel=-1)
		portage.writemsg_stdout("\n>>>" + yellow("'Selected'") + \
			" packages are slated for removal.\n", noiselevel=0)
		portage.writemsg_stdout(">>>" + green("'Protected'") + \
			" and " + green("'omitted'") + \
			" packages will not be removed.\n\n",
			noiselevel=0)
		countdown(int(mysettings["CLEAN_DELAY"]), ">>> Unmerging")

			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"]),
					yellow("Press Ctrl-C to Stop"))
		print "\n "+white(x)
		for mytype in ["selected","protected","omitted"]:
			print string.rjust(mytype,12)+":",

					else:
						myversion=mysplit[2]+"-"+mysplit[3]
					if mytype=="selected":
						portage.writemsg_stdout(" " + yellow(myversion))
					else:
						portage.writemsg_stdout(" " + green(myversion))
			else:
					print "none",
			print
	print "\n>>> " + yellow("'Selected'") + \
		" packages are slated for removal."
	print ">>> " + green("'Protected'") + " and " + green("'omitted'") + \
		" packages will not be removed.\n"
			" and " + colorize("GOOD", "'omitted'") + \
			" packages will not be removed.\n\n")

	if "--pretend" in myopts:
		#we're done... return

			vartree = trees[settings["ROOT"]]["vartree"]
			unmerge(settings, myopts, vartree, "clean", ["world"])
		else:
			portage.writemsg_stdout(yellow("WARNING:")
				+ " AUTOCLEAN is disabled.  This can cause serious"
				+ " problems due to overlapping packages.\n")
	if "--pretend" not in myopts:

Return to bug 138600

Lines 27-33 Link Here

(-)/usr/bin/emerge.ori (-19 / +17 lines)
27	import portage	27	import portage
28		28
29	import emergehelp, xpak, commands, errno, re, socket, string, time, types	29	import emergehelp, xpak, commands, errno, re, socket, string, time, types
30	from output import blue, bold, colorize, darkblue, darkgreen, darkred, green, \	30	from output import blue, bold, darkblue, darkgreen, darkred, green, \
31	havecolor, nc_len, nocolor, red, teal, turquoise, white, xtermTitle, \	31	havecolor, nc_len, nocolor, red, teal, turquoise, white, xtermTitle, \
32	xtermTitleReset, yellow	32	xtermTitleReset, yellow
33		33
Lines 251-257 Link Here
251	ticks=range(secs)	251	ticks=range(secs)
252	ticks.reverse()	252	ticks.reverse()
253	for sec in ticks:	253	for sec in ticks:
254	sys.stdout.write(colorize("WARN", str(sec+1)+" "))	254	sys.stdout.write(yellow(str(sec+1)+" "))
255	sys.stdout.flush()	255	sys.stdout.flush()
256	time.sleep(1)	256	time.sleep(1)
257	print	257	print
Lines 1970-1976 Link Here
1970	emergelog(xterm_titles,	1970	emergelog(xterm_titles,
1971	" --- AUTOCLEAN: Nothing unmerged.")	1971	" --- AUTOCLEAN: Nothing unmerged.")
1972	else:	1972	else:
1973	portage.writemsg_stdout(colorize("WARN", "WARNING:")	1973	portage.writemsg_stdout(yellow("WARNING:")
1974	+ " AUTOCLEAN is disabled. This can cause serious"	1974	+ " AUTOCLEAN is disabled. This can cause serious"
1975	+ " problems due to overlapping packages.\n")	1975	+ " problems due to overlapping packages.\n")
1976		1976
Lines 2084-2098 Link Here
2084	ommitted_versions = "none"	2084	ommitted_versions = "none"
2085	portage.writemsg_stdout("\n %s\n" % bold(mycp), noiselevel=-1)	2085	portage.writemsg_stdout("\n %s\n" % bold(mycp), noiselevel=-1)
2086	portage.writemsg_stdout("selected: ".rjust(14) + \	2086	portage.writemsg_stdout("selected: ".rjust(14) + \
2087	colorize("WARN", selected_versions) + "\n", noiselevel=-1)	2087	yellow(selected_versions) + "\n", noiselevel=-1)
2088	portage.writemsg_stdout("protected: ".rjust(14) + \	2088	portage.writemsg_stdout("protected: ".rjust(14) + \
2089	colorize("GOOD", protected_version) + "\n", noiselevel=-1)	2089	green(protected_version) + "\n", noiselevel=-1)
2090	portage.writemsg_stdout("omitted: ".rjust(14) + \	2090	portage.writemsg_stdout("omitted: ".rjust(14) + \
2091	colorize("GOOD", ommitted_versions) + "\n", noiselevel=-1)	2091	green(ommitted_versions) + "\n", noiselevel=-1)
2092	portage.writemsg_stdout("\n>>>" + colorize("WARN", "'Selected'") + \	2092	portage.writemsg_stdout("\n>>>" + yellow("'Selected'") + \
2093	" packages are slated for removal.\n", noiselevel=0)	2093	" packages are slated for removal.\n", noiselevel=0)
2094	portage.writemsg_stdout(">>>" + colorize("GOOD", "'Protected'") + \	2094	portage.writemsg_stdout(">>>" + green("'Protected'") + \
2095	" and " + colorize("GOOD", "'omitted'") + \	2095	" and " + green("'omitted'") + \
2096	" packages will not be removed.\n\n",	2096	" packages will not be removed.\n\n",
2097	noiselevel=0)	2097	noiselevel=0)
2098	countdown(int(mysettings["CLEAN_DELAY"]), ">>> Unmerging")	2098	countdown(int(mysettings["CLEAN_DELAY"]), ">>> Unmerging")
Lines 2296-2302 Link Here
2296	print yellow("\a!!! Unmerging it may be damaging to your system.\n")	2296	print yellow("\a!!! Unmerging it may be damaging to your system.\n")
2297	if "--pretend" not in myopts and "--ask" not in myopts:	2297	if "--pretend" not in myopts and "--ask" not in myopts:
2298	countdown(int(settings["EMERGE_WARNING_DELAY"]),	2298	countdown(int(settings["EMERGE_WARNING_DELAY"]),
2299	colorize("WARN", "Press Ctrl-C to Stop"))	2299	yellow("Press Ctrl-C to Stop"))
2300	print "\n "+white(x)	2300	print "\n "+white(x)
2301	for mytype in ["selected","protected","omitted"]:	2301	for mytype in ["selected","protected","omitted"]:
2302	print string.rjust(mytype,12)+":",	2302	print string.rjust(mytype,12)+":",
Lines 2308-2325 Link Here
2308	else:	2308	else:
2309	myversion=mysplit[2]+"-"+mysplit[3]	2309	myversion=mysplit[2]+"-"+mysplit[3]
2310	if mytype=="selected":	2310	if mytype=="selected":
2311	portage.writemsg_stdout(colorize("WARN", myversion))	2311	portage.writemsg_stdout(" " + yellow(myversion))
2312	else:	2312	else:
2313	portage.writemsg_stdout(colorize("GOOD", myversion))	2313	portage.writemsg_stdout(" " + green(myversion))
2314	else:	2314	else:
2315	print "none",	2315	print "none",
2316	print	2316	print
2317		2317	print "\n>>> " + yellow("'Selected'") + \
2318	portage.writemsg_stdout("\n>>> " + colorize("WARN", "'Selected'") + \	2318	" packages are slated for removal."
2319	" packages are slated for removal.\n")	2319	print ">>> " + green("'Protected'") + " and " + green("'omitted'") + \
2320	portage.writemsg_stdout(">>> " + colorize("GOOD", "'Protected'") + \	2320	" packages will not be removed.\n"
2321	" and " + colorize("GOOD", "'omitted'") + \
2322	" packages will not be removed.\n\n")
2323		2321
2324	if "--pretend" in myopts:	2322	if "--pretend" in myopts:
2325	#we're done... return	2323	#we're done... return
Lines 3409-3415 Link Here
3409	vartree = trees[settings["ROOT"]]["vartree"]	3407	vartree = trees[settings["ROOT"]]["vartree"]
3410	unmerge(settings, myopts, vartree, "clean", ["world"])	3408	unmerge(settings, myopts, vartree, "clean", ["world"])
3411	else:	3409	else:
3412	portage.writemsg_stdout(colorize("WARN", "WARNING:")	3410	portage.writemsg_stdout(yellow("WARNING:")
3413	+ " AUTOCLEAN is disabled. This can cause serious"	3411	+ " AUTOCLEAN is disabled. This can cause serious"
3414	+ " problems due to overlapping packages.\n")	3412	+ " problems due to overlapping packages.\n")
3415	if "--pretend" not in myopts:	3413	if "--pretend" not in myopts: