For bug #166880, always display the merge list (allowing --tree to be obeyed in any...

svn path=/main/branches/2.1.2/; revision=5999

diff --git a/bin/emerge b/bin/emerge
index 8f4f257128cc48f6fb779ec28b39ea57ae6a2ec9..55a63aa367e6a2f0564cc1047d3bfe1681124607 100755 (executable)
--- 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):