valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix key error for the PR to fix #24870.

Browse Source
This commit is contained in:
dkiser 2015-06-22 15:37:34 -07:00
parent bdcf7d88c1
commit 6c31143b22
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/cloud.py
View File

@ -1463,7 +1463,7 @@ def _exec_ssh_cmd(cmd, error_msg=None, allow_failure=False, **kwargs):
if stdout and SSH_PASSWORD_PROMP_RE.search(stdout): if stdout and SSH_PASSWORD_PROMP_RE.search(stdout):
# if authenticating with an SSH key and 'sudo' is found # if authenticating with an SSH key and 'sudo' is found
# in the password prompt # in the password prompt
if ('key_filename' in kwargs and kwargs['key'] if ('key_filename' in kwargs and kwargs['key_filename']
and SSH_PASSWORD_PROMP_SUDO_RE.search(stdout) and SSH_PASSWORD_PROMP_SUDO_RE.search(stdout)
): ):
# do nothing, as command already has adjustments to # do nothing, as command already has adjustments to