From fee6e2953b02229a2be658cca144570c8e54bf9f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 2 Feb 2017 14:31:11 -0800 Subject: [PATCH] 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 --- lib/ansible/plugins/connection/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/plugins/connection/__init__.py b/lib/ansible/plugins/connection/__init__.py index 6bc1994b814..77b8dcd8fcf 100644 --- a/lib/ansible/plugins/connection/__init__.py +++ b/lib/ansible/plugins/connection/__init__.py @@ -254,7 +254,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)