Merge pull request #3221 from havan/fix-sysdoc

Fix issue #3219
2024-11-07 08:58:59 +00:00 · 2013-01-10 13:03:50 -08:00 · 2013-01-10 13:03:50 -08:00 · 8f3886e67b
commit 8f3886e67b
parent 6a8e1f05a4 7806efdea3
1 changed files with 1 additions and 1 deletions
--- a/salt/cli/init.py
+++ b/salt/cli/init.py
@ -117,7 +117,7 @@ class SaltCMD(parsers.SaltCMDOptionParser):
        Print the output from a single return to the terminal
        '''
        # Handle special case commands
-        if self.config['fun'] == 'sys.doc':
+        if self.config['fun'] == 'sys.doc' and not isinstance(ret, Exception):
            self._print_docs(ret)
        else:
            # Determine the proper output method and run it