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

Fixed salt-run outputter handling.

Browse Source
This commit is contained in:
Dmitry Kuzmenko 2016-07-29 13:15:31 +03:00
parent 0589ba8dce
commit e419650bf1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/runner.py
View File

@ -233,7 +233,12 @@ class Runner(RunnerClient):
# otherwise run it in the main process
ret = self.cmd_sync(low)
display_output(ret, opts=self.opts)
if isinstance(ret, dict) and set(ret) == set(('data', 'outputter')):
outputter = ret['outputter']
ret = ret['data']
else:
outputter = None
display_output(ret, outputter, self.opts)
except salt.exceptions.SaltException as exc:
ret = '{0}'.format(exc)
if not self.opts.get('quiet', False):