From c9497bd77fd1e3f69b979a1799b7903b07972304 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 5 Jul 2011 12:38:31 +1000 Subject: s4-pycommon: allow an optional 'all' choice for confirm dialogs when asking the user to confirm an action, allow for an 'all' choice, which will be used to allow the user to confirm all future requests of the same type --- source4/scripting/python/samba/common.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/common.py b/source4/scripting/python/samba/common.py index a2a4962797..ebb3f88733 100644 --- a/source4/scripting/python/samba/common.py +++ b/source4/scripting/python/samba/common.py @@ -18,7 +18,7 @@ # along with this program. If not, see . # -def confirm(msg, forced = False): +def confirm(msg, forced = False, allow_all=False): """confirm an action with the user :param msg: A string to print to the user :param forced: Are the answer forced @@ -27,7 +27,13 @@ def confirm(msg, forced = False): print("%s [YES]" % msg) return True - v = raw_input(msg + ' [y/N] ') - return v.upper() in ['Y', 'YES'] + if allow_all: + v = raw_input(msg + ' [y/N/all] ') + if v.upper() == 'ALL': + return "ALL" + return v.upper() in ['Y', 'YES'] + else: + v = raw_input(msg + ' [y/N] ') + return v.upper() in ['Y', 'YES'] -- cgit