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

svn path=/main/trunk/; revision=5998

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 6d399326678c6201fd29a30fc81e9bdbf84a4b27..c867f06b22852b26c5338d5a5ec7de1481ba574d 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4734,7 +4734,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"]
@@ -4777,13 +4777,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):