Attachment #91510 for bug #132355




"sync",  "system", "unmerge",  "world",
]
options=[
"--ask",          "--alldeps",
"--alphabetical",
"--buildpkg",     "--buildpkgonly",
"--changelog",    "--columns", "--cols",
"--debug",        "--deep",


shortmapping={
"1":"--oneshot",
"a":"--ask",       "A":"--alldeps",
"b":"--buildpkg",  "B":"--buildpkgonly",
"c":"--clean",     "C":"--unmerge",
"d":"--debug",     "D":"--deep",

		print "* --tree is currently broken with --resume. Disabling..."
		myopts.remove("--tree")

# Allows user to control whether emerge factors in DEPEND when processing binpkgs
if ("alldeps" in portage.settings.features) or ("--alldeps" in myopts):
	portage.settings.unlock()
	portage.settings["ALLDEPS"] = "true"
	portage.settings.backup_changes("ALLDEPS")
	portage.settings.lock()

# Set color output
if "--nocolor" in myopts or \
portage.settings["NOCOLOR"] in ("yes","true"):

				sys.exit(1)
			if portage.db[portage.root]["bintree"].isremote(mykey):
				edepend = portage.db[portage.root]["bintree"].remotepkgs[tbz2name]
				if portage.settings["ALLDEPS"] or "alldeps" in portage.settings.features:
					edepend["DEPEND"]=string.join(string.split(edepend["DEPEND"])," ")
				else:
					edepend["DEPEND"] =""
				edepend["RDEPEND"]=string.join(string.split(edepend["RDEPEND"])," ")
				edepend["PDEPEND"]=string.join(string.split(edepend["PDEPEND"])," ")
				edepend["SLOT"]   =string.strip(edepend["SLOT"])
				#portage.db[portage.root]["bintree"].gettbz2(mykey)
			else: # It's local.
				mytbz2=xpak.tbz2(portage.db[portage.root]["bintree"].getname(mykey))
				if portage.settings["ALLDEPS"] or "alldeps" in portage.settings.features:
					edepend["DEPEND"]=string.join(mytbz2.getelements("DEPEND")," ")
				else:
					edepend["DEPEND"] =""
				edepend["RDEPEND"]=string.join(mytbz2.getelements("RDEPEND")," ")
				edepend["PDEPEND"]=string.join(mytbz2.getelements("PDEPEND")," ")
				edepend["SLOT"]   =mytbz2.getfile("SLOT",mypkgparts[2])

Lines 15-21 def shorthelp(): Link Here

(-)lib/portage/pym/emergehelp.py.orig (-1 / +4 lines)
15	print " "+turquoise("emerge")+" < "+turquoise("--sync")+" \| "+turquoise("--metadata")+" \| "+turquoise("--info")+" >"	15	print " "+turquoise("emerge")+" < "+turquoise("--sync")+" \| "+turquoise("--metadata")+" \| "+turquoise("--info")+" >"
16	print " "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" \| "+green("--ask")+" \| "+green("--skipfirst")+" ]"	16	print " "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" \| "+green("--ask")+" \| "+green("--skipfirst")+" ]"
17	print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" \| "+green("world")+" \| "+green("config")+" \| "+green("--sync")+" ] "	17	print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" \| "+green("world")+" \| "+green("config")+" \| "+green("--sync")+" ] "
18	print bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhikKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"	18	print bold("Options:")+" "+green("-")+"["+green("AabBcCdDefgGhikKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
19	print " ["+green("--columns")+"] ["+green("--nocolor")+"] ["+green("--nospinner")+"]"	19	print " ["+green("--columns")+"] ["+green("--nocolor")+"] ["+green("--nospinner")+"]"
20	print bold("Actions:")+" [ "+green("--clean")+" \| "+green("--depclean")+" \| "+green("--prune")+" \| "+green("--regen")+" \| "+green("--search")+" \| "+green("--unmerge")+" ]"	20	print bold("Actions:")+" [ "+green("--clean")+" \| "+green("--depclean")+" \| "+green("--prune")+" \| "+green("--regen")+" \| "+green("--search")+" \| "+green("--unmerge")+" ]"
21	print	21	print
Lines 145-150 def help(myaction,myopts,havecolor=1): Link Here
145	print " "+bold("emerge info")+" for more advanced information."	145	print " "+bold("emerge info")+" for more advanced information."
146	print	146	print
147	print turquoise("Options:")	147	print turquoise("Options:")
		148	print " "+green("--alldeps")
		149	print " Tell emerge to factor in DEPEND atoms when merging binary packages."
		150	print
148	print " "+green("--alphabetical")	151	print " "+green("--alphabetical")
149	print " When displaying USE and other flag output, combines the enabled"	152	print " When displaying USE and other flag output, combines the enabled"
150	print " and disabled flags into a single list and sorts it alphabetically."	153	print " and disabled flags into a single list and sorts it alphabetically."

Return to bug 132355

Lines 198-204 actions=[ Link Here

(-)bin/emerge.orig (-4 / +18 lines)
198	"sync", "system", "unmerge", "world",	198	"sync", "system", "unmerge", "world",
199	]	199	]
200	options=[	200	options=[
201	"--ask", "--alphabetical",	201	"--ask", "--alldeps",
		202	"--alphabetical",
202	"--buildpkg", "--buildpkgonly",	203	"--buildpkg", "--buildpkgonly",
203	"--changelog", "--columns", "--cols",	204	"--changelog", "--columns", "--cols",
204	"--debug", "--deep",	205	"--debug", "--deep",
Lines 223-229 options=[ Link Here
223		224
224	shortmapping={	225	shortmapping={
225	"1":"--oneshot",	226	"1":"--oneshot",
226	"a":"--ask",	227	"a":"--ask", "A":"--alldeps",
227	"b":"--buildpkg", "B":"--buildpkgonly",	228	"b":"--buildpkg", "B":"--buildpkgonly",
228	"c":"--clean", "C":"--unmerge",	229	"c":"--clean", "C":"--unmerge",
229	"d":"--debug", "D":"--deep",	230	"d":"--debug", "D":"--deep",
Lines 432-437 if ("--resume" in myopts): Link Here
432	print "* --tree is currently broken with --resume. Disabling..."	433	print "* --tree is currently broken with --resume. Disabling..."
433	myopts.remove("--tree")	434	myopts.remove("--tree")
434		435
		436	# Allows user to control whether emerge factors in DEPEND when processing binpkgs
		437	if ("alldeps" in portage.settings.features) or ("--alldeps" in myopts):
		438	portage.settings.unlock()
		439	portage.settings["ALLDEPS"] = "true"
		440	portage.settings.backup_changes("ALLDEPS")
		441	portage.settings.lock()
		442
435	# Set color output	443	# Set color output
436	if "--nocolor" in myopts or \	444	if "--nocolor" in myopts or \
437	portage.settings["NOCOLOR"] in ("yes","true"):	445	portage.settings["NOCOLOR"] in ("yes","true"):
Lines 997-1010 class depgraph: Link Here
997	sys.exit(1)	1005	sys.exit(1)
998	if portage.db[portage.root]["bintree"].isremote(mykey):	1006	if portage.db[portage.root]["bintree"].isremote(mykey):
999	edepend = portage.db[portage.root]["bintree"].remotepkgs[tbz2name]	1007	edepend = portage.db[portage.root]["bintree"].remotepkgs[tbz2name]
1000	edepend["DEPEND"] =""	1008	if portage.settings["ALLDEPS"] or "alldeps" in portage.settings.features:
		1009	edepend["DEPEND"]=string.join(string.split(edepend["DEPEND"])," ")
		1010	else:
		1011	edepend["DEPEND"] =""
1001	edepend["RDEPEND"]=string.join(string.split(edepend["RDEPEND"])," ")	1012	edepend["RDEPEND"]=string.join(string.split(edepend["RDEPEND"])," ")
1002	edepend["PDEPEND"]=string.join(string.split(edepend["PDEPEND"])," ")	1013	edepend["PDEPEND"]=string.join(string.split(edepend["PDEPEND"])," ")
1003	edepend["SLOT"] =string.strip(edepend["SLOT"])	1014	edepend["SLOT"] =string.strip(edepend["SLOT"])
1004	#portage.db[portage.root]["bintree"].gettbz2(mykey)	1015	#portage.db[portage.root]["bintree"].gettbz2(mykey)
1005	else: # It's local.	1016	else: # It's local.
1006	mytbz2=xpak.tbz2(portage.db[portage.root]["bintree"].getname(mykey))	1017	mytbz2=xpak.tbz2(portage.db[portage.root]["bintree"].getname(mykey))
1007	edepend["DEPEND"] =""	1018	if portage.settings["ALLDEPS"] or "alldeps" in portage.settings.features:
		1019	edepend["DEPEND"]=string.join(mytbz2.getelements("DEPEND")," ")
		1020	else:
		1021	edepend["DEPEND"] =""
1008	edepend["RDEPEND"]=string.join(mytbz2.getelements("RDEPEND")," ")	1022	edepend["RDEPEND"]=string.join(mytbz2.getelements("RDEPEND")," ")
1009	edepend["PDEPEND"]=string.join(mytbz2.getelements("PDEPEND")," ")	1023	edepend["PDEPEND"]=string.join(mytbz2.getelements("PDEPEND")," ")
1010	edepend["SLOT"] =mytbz2.getfile("SLOT",mypkgparts[2])	1024	edepend["SLOT"] =mytbz2.getfile("SLOT",mypkgparts[2])