valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3221 from havan/fix-sysdoc

Browse Source 
Fix issue #3219
This commit is contained in:
Thomas S Hatch 2013-01-10 13:03:50 -08:00
commit 8f3886e67b
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/cli/__init__.py
View File

@ -117,7 +117,7 @@ class SaltCMD(parsers.SaltCMDOptionParser):
Print the output from a single return to the terminal Print the output from a single return to the terminal
''' '''
# Handle special case commands # 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) self._print_docs(ret)
else: else:
# Determine the proper output method and run it # Determine the proper output method and run it