From cccca42d0470d9a2a972e8130418d82e97aa89b9 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 24 Oct 2009 06:55:34 +0000 Subject: 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. svn path=/main/trunk/; revision=14710 --- pym/_emerge/unmerge.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/unmerge.py') diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index 967d72478..aefc94b36 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"] @@ -483,7 +484,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() -- cgit v1.2.3-1-g7c22