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

Split on newlines when checking for prompt matches (#20945)

Browse source 
* Check for the prompt as a substring of the output

sudo sometimes spits out warnings to stdout before getting to the
password prompt.  Account for that when trying to match a password
prompt.

Fixes #20858
This commit is contained in:
Toshio Kuratomi 2017-02-02 14:31:11 -08:00 committed by GitHub
parent 62ba084003
commit fee6e2953b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -254,7 +254,7 @@ class ConnectionBase(with_metaclass(ABCMeta, object)):
return False return False
elif isinstance(self._play_context.prompt, string_types): elif isinstance(self._play_context.prompt, string_types):
b_prompt = to_bytes(self._play_context.prompt) b_prompt = to_bytes(self._play_context.prompt)
return b_output.startswith(b_prompt) return b_prompt in b_output
else: else:
return self._play_context.prompt(b_output) return self._play_context.prompt(b_output)