[gentoo-portage-dev] [PATCH] Replace --ask with --pretend if operation not allowed

[Daniel Barkalow]

If some operation requires root or portage access, and the user doesn't 
have it, and the --ask option is enabled, replace it with --pretend 
instead of aborting with an error.

Also rearranges the test for required privs to eliminate the duplication 
of the consequences, which are not more than 2 lines.

Applies to current trunk.

Signed-off-by: Daniel Barkalow <barkalow@××××××××.org>

Index: bin/emerge
===================================================================
--- bin/emerge	(revision 5050)
+++ bin/emerge	(working copy)
@@ -4571,15 +4571,17 @@
 		# We've already allowed "--version" and "--help" above.
 		if "--pretend" not in myopts and \
 		myaction not in ("search","info"):
-			if portage.secpass >= 1:
-				if "--fetchonly" not in myopts and \
-				"--fetch-all-uri" not in myopts and \
-				myaction not in ("metadata", "regen"):
+			if portage.secpass < 1 or \
+			("--fetchonly" not in myopts and \
+			 "--fetch-all-uri" not in myopts and \
+			 myaction not in ("metadata", "regen")):
+				if "--ask" in myopts:
+					myopts["--pretend"] = True
+					del myopts["--ask"]
+					print "root access would be required... adding --pretend to options."
+				else:
 					print "emerge: root access required."
 					sys.exit(1)
-			else:
-				print "emerge: root access required."
-				sys.exit(1)
 
 	disable_emergelog = False
 	for x in ("--pretend", "--fetchonly", "--fetch-all-uri"):
-- 
gentoo-portage-dev@g.o mailing list