Merge pull request #28638 from alprs/saltssh-handle_ssh_errors

Salt-SSH: Return more concise error when SSH command fails
This commit is contained in:
Mike Place 2015-11-06 09:54:46 -07:00
commit 4722e41787

View File

@ -544,6 +544,10 @@ class SSH(object):
self.cache_job(jid, host, ret[host], fun)
ret = self.key_deploy(host, ret)
if ret[host].get('stderr', '').startswith('ssh:'):
ret[host] = ret[host]['stderr']
if not isinstance(ret[host], dict):
p_data = {host: ret[host]}
elif 'return' not in ret[host]: