diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-24 07:06:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-24 07:06:38 +0000 |
| commit | 91eb98301496a5dae1fe75dcbcb77abe3fb4135a (patch) | |
| tree | 707dc67e49103e66d0b4e0ad9912d2af418236a2 /pym/_emerge/unmerge.py | |
| parent | 060eceac479fc2b48a6ec264c4e47a1df7df1994 (diff) | |
| download | portage-91eb98301496a5dae1fe75dcbcb77abe3fb4135a.tar.gz portage-91eb98301496a5dae1fe75dcbcb77abe3fb4135a.tar.bz2 portage-91eb98301496a5dae1fe75dcbcb77abe3fb4135a.zip | |
Bug #134466 - Add a --ask-enter-invalid option. When used together with the
--ask option, interpret a single "Enter" key press as invalid input. This
helps prevent accidental acceptance of the first choice. (trunk r14710)
svn path=/main/branches/2.1.7/; revision=14719
Diffstat (limited to 'pym/_emerge/unmerge.py')
| -rw-r--r-- | pym/_emerge/unmerge.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index ef8b92cc5..292a71cec 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -27,6 +27,7 @@ def unmerge(root_config, myopts, unmerge_action, if clean_world: clean_world = myopts.get('--deselect') != 'n' quiet = "--quiet" in myopts + enter_invalid = '--ask-enter-invalid' in myopts settings = root_config.settings sets = root_config.sets vartree = root_config.trees["vartree"] @@ -396,7 +397,8 @@ def unmerge(root_config, myopts, unmerge_action, #we're done... return return 0 if "--ask" in myopts: - if userquery("Would you like to unmerge these packages?")=="No": + if userquery("Would you like to unmerge these packages?", + enter_invalid) == "No": # enter pretend mode for correct formatting of results myopts["--pretend"] = True print() |