Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 138131
Collapse All | Expand All

(-)bin/emerge (-3 / +4 lines)
Lines 2816-2822 Link Here
2816
	mybestpv=portage.portdb.xmatch("bestmatch-visible","sys-apps/portage")
2816
	mybestpv=portage.portdb.xmatch("bestmatch-visible","sys-apps/portage")
2817
	mypvs=portage.best(portage.db[portage.root]["vartree"].dbapi.match("sys-apps/portage"))
2817
	mypvs=portage.best(portage.db[portage.root]["vartree"].dbapi.match("sys-apps/portage"))
2818
2818
2819
	chk_updated_cfg_files()
2819
	chk_updated_cfg_files("/", settings.get("CONFIG_PROTECT","").split())
2820
2820
2821
	if myaction != "metadata":
2821
	if myaction != "metadata":
2822
		if os.access(portage.USER_CONFIG_PATH + "/bin/post_sync", os.X_OK):
2822
		if os.access(portage.USER_CONFIG_PATH + "/bin/post_sync", os.X_OK):
Lines 3089-3095 Link Here
3089
			if "cvs_id_string" in dir(module):
3089
			if "cvs_id_string" in dir(module):
3090
				print "%s: %s" % (str(x), str(module.cvs_id_string))
3090
				print "%s: %s" % (str(x), str(module.cvs_id_string))
3091
3091
3092
def action_search(myopts, myfiles, spinner):
3092
def action_search(settings, vartree, myopts, myfiles, spinner):
3093
	if not myfiles:
3093
	if not myfiles:
3094
		print "emerge: no search terms provided."
3094
		print "emerge: no search terms provided."
3095
	else:
3095
	else:
Lines 3795-3801 Link Here
3795
	
3795
	
3796
	# SEARCH action
3796
	# SEARCH action
3797
	elif "search"==myaction:
3797
	elif "search"==myaction:
3798
		action_search(myopts, myfiles)
3798
		action_search(settings, trees["/"]["vartree"],
3799
			myopts, myfiles, spinner)
3799
	elif "unmerge"==myaction or "prune"==myaction or "clean"==myaction:
3800
	elif "unmerge"==myaction or "prune"==myaction or "clean"==myaction:
3800
		vartree = trees[settings["ROOT"]]["vartree"]
3801
		vartree = trees[settings["ROOT"]]["vartree"]
3801
		if 1 == unmerge(settings, myopts, vartree, myaction, myfiles,
3802
		if 1 == unmerge(settings, myopts, vartree, myaction, myfiles,

Return to bug 138131