wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When become_method is su, self._play_context.prompt is a function. Fixes #23689

Browse source 
(cherry picked from commit f82d95ae28)
This commit is contained in:
Matt Martz 2017-04-18 11:34:07 -05:00 committed by Brian Coca
parent 82dcaa725f
commit 8e1b422e4a
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/plugins/connection/__init__.py
View file

@ -260,6 +260,8 @@ class ConnectionBase(with_metaclass(ABCMeta, object)):
if not b_lines: if not b_lines:
return False return False
return b_lines[-1].strip().endswith(b_prompt) or b_lines[0].strip().endswith(b_prompt) return b_lines[-1].strip().endswith(b_prompt) or b_lines[0].strip().endswith(b_prompt)
else:
return self._play_context.prompt(b_output)
def check_incorrect_password(self, b_output): def check_incorrect_password(self, b_output):
b_incorrect_password = to_bytes(gettext.dgettext(self._play_context.become_method, C.BECOME_ERROR_STRINGS[self._play_context.become_method])) b_incorrect_password = to_bytes(gettext.dgettext(self._play_context.become_method, C.BECOME_ERROR_STRINGS[self._play_context.become_method]))