cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'shirou-devel' into devel

Browse source
This commit is contained in:
James Cammarata 2014-05-21 10:24:31 -05:00
commit f54a3b6641
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/callbacks.py
View file

@ -651,9 +651,10 @@ class PlaybookCallbacks(object):
msg = 'input for %s: ' % varname msg = 'input for %s: ' % varname
def prompt(prompt, private): def prompt(prompt, private):
msg = prompt.encode(sys.stdout.encoding)
if private: if private:
return getpass.getpass(prompt) return getpass.getpass(msg)
return raw_input(prompt) return raw_input(msg)
if confirm: if confirm:

2
lib/ansible/runner/action_plugins/pause.py
View file

@ -101,7 +101,7 @@ class ActionModule(object):
# Clear out any unflushed buffered input which would # Clear out any unflushed buffered input which would
# otherwise be consumed by raw_input() prematurely. # otherwise be consumed by raw_input() prematurely.
tcflush(sys.stdin, TCIFLUSH) tcflush(sys.stdin, TCIFLUSH)
self.result['user_input'] = raw_input(self.prompt) self.result['user_input'] = raw_input(self.prompt.encode(sys.stdout.encoding))
except KeyboardInterrupt: except KeyboardInterrupt:
while True: while True:
print '\nAction? (a)bort/(c)ontinue: ' print '\nAction? (a)bort/(c)ontinue: '