[patch] always display the merge list (even without --ask or --pretend)

always_display.patch (text/plain), 933 bytes, created by Zac Medico on 2007-02-17 20:49:48 UTC

Index: bin/emerge
===================================================================
--- bin/emerge	(revision 5985)
+++ bin/emerge	(working copy)
@@ -4663,7 +4663,7 @@
 			sys.stderr.write("\nThese are required by '--usepkgonly' -- Terminating.\n\n")
 			sys.exit(1)
 
-	if "--ask" in myopts:
+	if True:
 		if "--resume" in myopts:
 			validate_merge_list(trees, mtimedb["resume"]["mergelist"])
 			mymergelist = mtimedb["resume"]["mergelist"]
@@ -4706,13 +4706,13 @@
 			else:
 				prompt="Would you like to merge these packages?"
 		print
-		if userquery(prompt)=="No":
+		if "--ask" in myopts and userquery(prompt) == "No":
 			print
 			print "Quitting."
 			print
 			sys.exit(0)
 		# Don't ask again (e.g. when auto-cleaning packages after merge)
-		del myopts["--ask"]
+		myopts.pop("--ask", None)
 
 	if ("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts):
 		if ("--resume" in myopts):