Attachment #108297 for bug #164078

View | Details | Raw Unified | Return to bug 164078
Collapse All | Expand All




						xsplit=portage.pkgsplit(x[2])
						emergelog(xterm_titles, " >>> AUTOCLEAN: " + xsplit[0])
						retval = unmerge(pkgsettings, self.myopts, vartree,
							"clean", [xsplit[0]], ldpath_mtimes, 0)
						if not retval:
							emergelog(xterm_titles,
								" --- AUTOCLEAN: Nothing unmerged.")

		return os.EX_OK

def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
	ldpath_mtimes, manual=1):
	candidate_catpkgs=[]
	global_unmerge=0
	xterm_titles = "notitles" not in settings.features

			print
			return 0
	#the real unmerging begins, after a short delay....
	if manual:
		countdown(int(settings["CLEAN_DELAY"]), ">>> Unmerging")

	for x in pkgmap.keys():
		for y in pkgmap[x]["selected"]:

Return to bug 164078

Lines 3065-3071 Link Here

(-)/var/tmp/portage/sys-apps/portage-2.1.2-r4/work/portage-2.1.2/bin/emerge (-3 / +4 lines)
3065	xsplit=portage.pkgsplit(x[2])	3065	xsplit=portage.pkgsplit(x[2])
3066	emergelog(xterm_titles, " >>> AUTOCLEAN: " + xsplit[0])	3066	emergelog(xterm_titles, " >>> AUTOCLEAN: " + xsplit[0])
3067	retval = unmerge(pkgsettings, self.myopts, vartree,	3067	retval = unmerge(pkgsettings, self.myopts, vartree,
3068	"clean", [xsplit[0]], ldpath_mtimes)	3068	"clean", [xsplit[0]], ldpath_mtimes, 0)
3069	if not retval:	3069	if not retval:
3070	emergelog(xterm_titles,	3070	emergelog(xterm_titles,
3071	" --- AUTOCLEAN: Nothing unmerged.")	3071	" --- AUTOCLEAN: Nothing unmerged.")
Lines 3151-3157 Link Here
3151	return os.EX_OK	3151	return os.EX_OK
3152		3152
3153	def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,	3153	def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
3154	ldpath_mtimes):	3154	ldpath_mtimes, manual=1):
3155	candidate_catpkgs=[]	3155	candidate_catpkgs=[]
3156	global_unmerge=0	3156	global_unmerge=0
3157	xterm_titles = "notitles" not in settings.features	3157	xterm_titles = "notitles" not in settings.features
Lines 3403-3409 Link Here
3403	print	3403	print
3404	return 0	3404	return 0
3405	#the real unmerging begins, after a short delay....	3405	#the real unmerging begins, after a short delay....
3406	countdown(int(settings["CLEAN_DELAY"]), ">>> Unmerging")	3406	if manual:
		3407	countdown(int(settings["CLEAN_DELAY"]), ">>> Unmerging")
3407		3408
3408	for x in pkgmap.keys():	3409	for x in pkgmap.keys():
3409	for y in pkgmap[x]["selected"]:	3410	for y in pkgmap[x]["selected"]: