diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-06-17 20:50:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-06-17 20:50:05 +0000 |
| commit | 818718357bca76f2e7ad27d8c16d5414052b6980 (patch) | |
| tree | a73327730db3614a1feff8093a495b28d53c1cf2 /pym/_emerge/__init__.py | |
| parent | 100708075b372b500531f24500feb9303a785d6a (diff) | |
| download | portage-818718357bca76f2e7ad27d8c16d5414052b6980.tar.gz portage-818718357bca76f2e7ad27d8c16d5414052b6980.tar.bz2 portage-818718357bca76f2e7ad27d8c16d5414052b6980.zip | |
When --pretend overrides --ask, don't show any output.
svn path=/main/trunk/; revision=13650
Diffstat (limited to 'pym/_emerge/__init__.py')
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
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. |