Ensure local exec errs have a meaningful error output

jynolen · Dec 30, 2023 · 1d0dfde · 1d0dfde
1 parent 1beb3ee
commit 1d0dfde
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/salt/client/ssh/wrapper/__init__.py b/salt/client/ssh/wrapper/__init__.py
@@ -88,7 +88,10 @@ def to_ret(self):
         return super().to_ret()
 
     def __str__(self):
-        return f"{self._error}: {self.stderr or self.stdout}"
+        ret = self.to_ret()
+        if not isinstance(ret, str):
+            ret = self.stderr or self.stdout
+        return f"{self._error}: {ret}"
 
 
 class SSHPermissionDeniedError(SSHException):