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

fix py3 string error in ssh failure handling (#42655)

Browse source
This commit is contained in:
Matt Davis 2018-07-13 14:36:46 -07:00 committed by GitHub
parent 0421305254
commit 5d76b627ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/plugins/connection/ssh.py
View file

@ -297,10 +297,10 @@ except ImportError:
display = Display()
NOT_SSH_ERRORS = ('Traceback (most recent call last):', # Python-2.6 when there's an exception
# while invoking a script via -m
'PHP Parse error:', # Php always returns error 255
)
b_NOT_SSH_ERRORS = (b'Traceback (most recent call last):', # Python-2.6 when there's an exception
# while invoking a script via -m
b'PHP Parse error:', # Php always returns error 255
)
SSHPASS_AVAILABLE = None
@ -351,7 +351,7 @@ def _ssh_retry(func):
if return_tuple[0] == 255:
SSH_ERROR = True
for signature in NOT_SSH_ERRORS:
for signature in b_NOT_SSH_ERRORS:
if signature in return_tuple[1]:
SSH_ERROR = False
break