From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 17 Jun 2009 20:50:05 +0000 (-0000)
Subject: When --pretend overrides --ask, don't show any output.
X-Git-Tag: v2.2_rc34~186
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=818718357bca76f2e7ad27d8c16d5414052b6980;p=portage.git

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 874f77d8f..8ef667a07 100644
--- 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.