fixed issue with vars prompt warning causing error

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 9eaa5fecc1
commit 7c7e849a27

View file

@ -273,7 +273,6 @@ class Display:
else:
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):
result = None
@ -294,12 +293,12 @@ class Display:
second = do_prompt("confirm " + msg, private)
if result == second:
break
display.display("***** VALUES ENTERED DO NOT MATCH ****")
self.display("***** VALUES ENTERED DO NOT MATCH ****")
else:
result = do_prompt(msg, private)
else:
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 not result and default is not None: