When --pretend overrides --ask, don't show any output.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 874f77d8f357caf200c9e07812b4334017e3f7dd..8ef667a0791aaa40bd2820db8083184ce7163a8a 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -16090,9 +16090,8 @@ def emerge_main():
                myopts["--usepkg"] = True
 
        # Allow -p to remove --ask
-       if ("--pretend" in myopts) and ("--ask" in myopts):
-               print ">>> --pretend disables --ask... removing --ask from options."
-               del myopts["--ask"]
+       if "--pretend" in myopts:
+               myopts.pop("--ask", None)
 
        # forbid --ask when not in a terminal
        # note: this breaks `emerge --ask | tee logfile`, but that doesn't work anyway.