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

* Transform vars_prompt result to unicode type before returning (Fixes #10319)

Browse source 
* Rename prompt method as do_prompt to avoid potential bug when logging via a callback plugin
This commit is contained in:
Toshio Kuratomi 2015-02-23 07:56:07 -08:00
parent db91ab35e7
commit a6fbd83660
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/callbacks.py
View file

@ -28,6 +28,7 @@ import constants
import locale
from ansible.color import stringc
from ansible.module_utils import basic
from ansible.utils.unicode import to_unicode
import logging
if constants.DEFAULT_LOG_PATH != '':
@ -661,7 +662,7 @@ class PlaybookCallbacks(object):
else:
msg = 'input for %s: ' % varname
def prompt(prompt, private):
def do_prompt(prompt, private):
if sys.stdout.encoding:
msg = prompt.encode(sys.stdout.encoding)
else:
@ -676,13 +677,13 @@ class PlaybookCallbacks(object):
if confirm:
while True:
result = prompt(msg, private)
second = prompt("confirm " + msg, private)
result = do_prompt(msg, private)
second = do_prompt("confirm " + msg, private)
if result == second:
break
display("***** VALUES ENTERED DO NOT MATCH ****")
else:
result = prompt(msg, private)
result = do_prompt(msg, private)
# if result is false and default is not None
if not result and default is not None:
@ -690,8 +691,10 @@ class PlaybookCallbacks(object):
if encrypt:
result = utils.do_encrypt(result,encrypt,salt_size,salt)
result = utils.do_encrypt(result, encrypt, salt_size, salt)
# handle utf-8 chars
result = to_unicode(result, error='strict')
call_callback_module( 'playbook_on_vars_prompt', varname, private=private, prompt=prompt,
encrypt=encrypt, confirm=confirm, salt_size=salt_size, salt=None, default=default
)