Merge pull request #28638 from alprs/saltssh-handle_ssh_errors

Salt-SSH: Return more concise error when SSH command fails
saltstack · Nov 6, 2015 · 4722e41 · 4722e41
2 parents e72e60d + 5419b98
commit 4722e41
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py
@@ -544,6 +544,10 @@ def run(self):
 
             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]: