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

Summary requires full return information.

Browse Source
This commit is contained in:
Thayne Harbaugh 2015-09-09 09:53:43 -06:00
parent c3a2355a62
commit 2de88e681d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/cli/salt.py
View File

@ -194,7 +194,7 @@ class SaltCMD(parsers.SaltCMDOptionParser):
out = ''
for full_ret in local.cmd_cli(**kwargs):
ret_, out, retcode = self._format_ret(full_ret)
ret.update(ret_)
ret.update(full_ret)
self._output_ret(ret, out)
else:
if self.options.verbose:
@ -205,7 +205,7 @@ class SaltCMD(parsers.SaltCMDOptionParser):
ret_, out, retcode = self._format_ret(full_ret)
retcodes.append(retcode)
self._output_ret(ret_, out)
ret.update(ret_)
ret.update(full_ret)
except KeyError:
errors.append(full_ret)