From c647cf3331d396e4860187d870c27be578d4f233 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 18 Feb 2007 21:57:20 +0000
Subject: [PATCH] For bug #166880, always display the merge list (allowing
 --tree to be obeyed in any case). (trunk r5997:5998)

svn path=/main/branches/2.1.2/; revision=5999
---
 bin/emerge | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/emerge b/bin/emerge
index 8f4f25712..55a63aa36 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4673,7 +4673,7 @@ def action_build(settings, trees, mtimedb,
 			sys.stderr.write("\nThese are required by '--usepkgonly' -- Terminating.\n\n")
 			sys.exit(1)
 
-	if "--ask" in myopts:
+	if "--pretend" not in myopts:
 		if "--resume" in myopts:
 			validate_merge_list(trees, mtimedb["resume"]["mergelist"])
 			mymergelist = mtimedb["resume"]["mergelist"]
@@ -4716,13 +4716,13 @@ def action_build(settings, trees, mtimedb,
 			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):
-- 
2.26.2