ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

fixed issue with vars prompt warning causing error

Browse source 
sometimes display object is not magically available, use it explicitly,
no need to be classmethod anymore
fixes #14147
This commit is contained in:
Brian Coca 2016-01-27 16:12:08 -05:00
parent 3f3e3e3d5b
commit c857b20043
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/utils/display.py
View file

@ -278,13 +278,12 @@ class Display:
else: else:
return input(prompt_string) return input(prompt_string)
@classmethod def do_var_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None):
def do_var_prompt(cls, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None):
result = None result = None
if sys.__stdin__.isatty(): if sys.__stdin__.isatty():
do_prompt = cls.prompt do_prompt = self.prompt
if prompt and default is not None: if prompt and default is not None:
msg = "%s [%s]: " % (prompt, default) msg = "%s [%s]: " % (prompt, default)
@ -299,12 +298,12 @@ class Display:
second = do_prompt("confirm " + msg, private) second = do_prompt("confirm " + msg, private)
if result == second: if result == second:
break break
display.display("***** VALUES ENTERED DO NOT MATCH ****") self.display("***** VALUES ENTERED DO NOT MATCH ****")
else: else:
result = do_prompt(msg, private) result = do_prompt(msg, private)
else: else:
result = None result = None
display.warning("Not prompting as we are not in interactive mode") self.warning("Not prompting as we are not in interactive mode")
# if result is false and default is not None # if result is false and default is not None
if not result and default is not None: if not result and default is not None: