saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #28882 from basepi/salt-ssh.stacktrace.28881

Browse source 
[2015.8] salt-ssh: Check return type to make sure it's an error
This commit is contained in:
Colton Myers 2015-11-13 17:14:46 -07:00
commit 5dc7fccb07
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/client/ssh/__init__.py
View file

@ -545,7 +545,7 @@ class SSH(object):
self.cache_job(jid, host, ret[host], fun)
ret = self.key_deploy(host, ret)
if ret[host].get('stderr', '').startswith('ssh:'):
if isinstance(ret[host], dict) and ret[host].get('stderr', '').startswith('ssh:'):
ret[host] = ret[host]['stderr']
if not isinstance(ret[host], dict):