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

* 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
(cherry picked from commit fee6e2953b)
This commit is contained in:
Toshio Kuratomi 2017-02-02 14:31:11 -08:00
parent a0104cfe81
commit 3551de98c6

View file

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