Skip to content

Commit

Permalink
Ignore retcode when formatting highstate output
Browse files Browse the repository at this point in the history
  • Loading branch information
terminalmage committed Jul 5, 2016
1 parent b3875f3 commit 82a70e0
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions salt/output/highstate.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,15 @@ def output(data):
data = data.pop('data')

for host, hostdata in six.iteritems(data):
if not isinstance(hostdata, dict):
# Highstate return data must be a dict, if this is not the case
# then this value is likely a retcode.
continue
return _format_host(host, hostdata)[0]
log.error(
'Data passed to highstate outputter is not a valid highstate return: %s',
data
)


def _format_host(host, data):
Expand Down

0 comments on commit 82a70e0

Please sign in to comment.