Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
f54a3b66
Commit
f54a3b66
authored
May 21, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'shirou-devel' into devel
parents
ed7e1721
56880b76
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
lib/ansible/callbacks.py
+3
-2
lib/ansible/runner/action_plugins/pause.py
+1
-1
No files found.
lib/ansible/callbacks.py
View file @
f54a3b66
...
...
@@ -651,9 +651,10 @@ class PlaybookCallbacks(object):
msg
=
'input for
%
s: '
%
varname
def
prompt
(
prompt
,
private
):
msg
=
prompt
.
encode
(
sys
.
stdout
.
encoding
)
if
private
:
return
getpass
.
getpass
(
prompt
)
return
raw_input
(
prompt
)
return
getpass
.
getpass
(
msg
)
return
raw_input
(
msg
)
if
confirm
:
...
...
lib/ansible/runner/action_plugins/pause.py
View file @
f54a3b66
...
...
@@ -101,7 +101,7 @@ class ActionModule(object):
# Clear out any unflushed buffered input which would
# otherwise be consumed by raw_input() prematurely.
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
:
while
True
:
print
'
\n
Action? (a)bort/(c)ontinue: '
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment