Attachment #88176 for bug #135261





#number of ebuilds merged
merged=0
params=["selective", "shallow", "self", "recurse", "empty"]
actions=[
"clean", "config", "depclean",
"info", "metadata",

"--ask",          "--alphabetical",
"--buildpkg",     "--buildpkgonly",
"--changelog",    "--columns", "--cols",
"--debug",        "--shallow",
"--digest",
"--emptytree",
"--fetchonly",    "--fetch-all-uri",

"a":"--ask",
"b":"--buildpkg",  "B":"--buildpkgonly",
"c":"--clean",     "C":"--unmerge",
"d":"--debug",
"e":"--emptytree",
"f":"--fetchonly", "F":"--fetch-all-uri",
"g":"--getbinpkg", "G":"--getbinpkgonly",

				else:
					cmdline.append(shortmapping[y])
			else:
				if y=="D":
					print "*** Warning: Deep is now the default update method. Use --shallow to revert."
				else:
					print "!!! Error: -"+y+" is an invalid short action or option."
					sys.exit(1)
	else:
		cmdline.append(x)


				sys.exit(1)
			myaction=x[2:]
		else:
			if x=="--deep":
				print "*** Warning: Deep is now the default update method. Use --shallow to revert."
			else:
				print "!!! Error:",x,"is an invalid option."
				sys.exit(1)
	elif (not myaction) and (x in actions):
		if x not in ["system", "world"]:
			print red("*** Deprecated use of action '%s', use '--%s' instead" % (x,x))

	sub.extend(["recurse"])
if "--noreplace" in myopts:
	add.extend(["selective"])
if "--shallow" in myopts:
	add.extend(["shallow"])
if "--selective" in myopts:
	add.extend(["selective"])
if myaction in ["world","system"]:

		# whatever the case, we need to add the node to our digraph so
		# that children can depend upon it.
		self.digraph.addnode(string.join(mybigkey),myparent)
		if ("shallow" in myparams) and (not merging):
			return 1
		elif "recurse" not in myparams:
			return 1


	print
	print red("*** WARNING ***")+"  --depclean is known to be broken. It is highly recommended"
	print red("*** WARNING ***")+"  that "+green("`emerge --update --newuse world`")+" be ran before"
	print red("*** WARNING ***")+"  commencing. However, using --depclean may still break link"
	print red("*** WARNING ***")+"  level consistency within your system. "+green("`revdep-rebuild`")
	print red("*** WARNING ***")+"  from app-portage/gentoolkit can help to detect breakage."

Return to bug 135261

Lines 190-196 Link Here

(-)emerge-orig (-11 / +17 lines)
190		190
191	#number of ebuilds merged	191	#number of ebuilds merged
192	merged=0	192	merged=0
193	params=["selective", "deep", "self", "recurse", "empty"]	193	params=["selective", "shallow", "self", "recurse", "empty"]
194	actions=[	194	actions=[
195	"clean", "config", "depclean",	195	"clean", "config", "depclean",
196	"info", "metadata",	196	"info", "metadata",
Lines 201-207 Link Here
201	"--ask", "--alphabetical",	201	"--ask", "--alphabetical",
202	"--buildpkg", "--buildpkgonly",	202	"--buildpkg", "--buildpkgonly",
203	"--changelog", "--columns", "--cols",	203	"--changelog", "--columns", "--cols",
204	"--debug", "--deep",	204	"--debug", "--shallow",
205	"--digest",	205	"--digest",
206	"--emptytree",	206	"--emptytree",
207	"--fetchonly", "--fetch-all-uri",	207	"--fetchonly", "--fetch-all-uri",
Lines 226-232 Link Here
226	"a":"--ask",	226	"a":"--ask",
227	"b":"--buildpkg", "B":"--buildpkgonly",	227	"b":"--buildpkg", "B":"--buildpkgonly",
228	"c":"--clean", "C":"--unmerge",	228	"c":"--clean", "C":"--unmerge",
229	"d":"--debug", "D":"--deep",	229	"d":"--debug",
230	"e":"--emptytree",	230	"e":"--emptytree",
231	"f":"--fetchonly", "F":"--fetch-all-uri",	231	"f":"--fetchonly", "F":"--fetch-all-uri",
232	"g":"--getbinpkg", "G":"--getbinpkgonly",	232	"g":"--getbinpkg", "G":"--getbinpkgonly",
Lines 263-270 Link Here
263	else:	263	else:
264	cmdline.append(shortmapping[y])	264	cmdline.append(shortmapping[y])
265	else:	265	else:
266	print "!!! Error: -"+y+" is an invalid short action or option."	266	if y=="D":
267	sys.exit(1)	267	print "*** Warning: Deep is now the default update method. Use --shallow to revert."
		268	else:
		269	print "!!! Error: -"+y+" is an invalid short action or option."
		270	sys.exit(1)
268	else:	271	else:
269	cmdline.append(x)	272	cmdline.append(x)
270		273
Lines 291-298 Link Here
291	sys.exit(1)	294	sys.exit(1)
292	myaction=x[2:]	295	myaction=x[2:]
293	else:	296	else:
294	print "!!! Error:",x,"is an invalid option."	297	if x=="--deep":
295	sys.exit(1)	298	print "*** Warning: Deep is now the default update method. Use --shallow to revert."
		299	else:
		300	print "!!! Error:",x,"is an invalid option."
		301	sys.exit(1)
296	elif (not myaction) and (x in actions):	302	elif (not myaction) and (x in actions):
297	if x not in ["system", "world"]:	303	if x not in ["system", "world"]:
298	print red("*** Deprecated use of action '%s', use '--%s' instead" % (x,x))	304	print red("*** Deprecated use of action '%s', use '--%s' instead" % (x,x))
Lines 681-688 Link Here
681	sub.extend(["recurse"])	687	sub.extend(["recurse"])
682	if "--noreplace" in myopts:	688	if "--noreplace" in myopts:
683	add.extend(["selective"])	689	add.extend(["selective"])
684	if "--deep" in myopts:	690	if "--shallow" in myopts:
685	add.extend(["deep"])	691	add.extend(["shallow"])
686	if "--selective" in myopts:	692	if "--selective" in myopts:
687	add.extend(["selective"])	693	add.extend(["selective"])
688	if myaction in ["world","system"]:	694	if myaction in ["world","system"]:
Lines 1010-1016 Link Here
1010	# whatever the case, we need to add the node to our digraph so	1016	# whatever the case, we need to add the node to our digraph so
1011	# that children can depend upon it.	1017	# that children can depend upon it.
1012	self.digraph.addnode(string.join(mybigkey),myparent)	1018	self.digraph.addnode(string.join(mybigkey),myparent)
1013	if ("deep" not in myparams) and (not merging):	1019	if ("shallow" in myparams) and (not merging):
1014	return 1	1020	return 1
1015	elif "recurse" not in myparams:	1021	elif "recurse" not in myparams:
1016	return 1	1022	return 1
Lines 3250-3256 Link Here
3250		3256
3251	print	3257	print
3252	print red("* WARNING *")+" --depclean is known to be broken. It is highly recommended"	3258	print red("* WARNING *")+" --depclean is known to be broken. It is highly recommended"
3253	print red("* WARNING *")+" that "+green("`emerge --update --newuse --deep world`")+" be ran before"	3259	print red("* WARNING *")+" that "+green("`emerge --update --newuse world`")+" be ran before"
3254	print red("* WARNING *")+" commencing. However, using --depclean may still break link"	3260	print red("* WARNING *")+" commencing. However, using --depclean may still break link"
3255	print red("* WARNING *")+" level consistency within your system. "+green("`revdep-rebuild`")	3261	print red("* WARNING *")+" level consistency within your system. "+green("`revdep-rebuild`")
3256	print red("* WARNING *")+" from app-portage/gentoolkit can help to detect breakage."	3262	print red("* WARNING *")+" from app-portage/gentoolkit can help to detect breakage."