saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix highstate outputter when it's given multiple results

Browse source 
This fixes issue #25664
This commit is contained in:
Jingran Lin 2016-08-18 10:27:48 +01:00
parent f2eb3dc105
commit 27aa038cc6
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
salt/output/highstate.py
View file

@ -130,12 +130,15 @@ def output(data):
if 'data' in 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]
ret = [
_format_host(host, hostdata)[0]
for host, hostdata in six.iteritems(data)
# Highstate return data must be a dict, if this is not the case
# then this value is likely a retcode.
if isinstance(hostdata, dict)
]
if ret:
return "\n".join(ret)
log.error(
'Data passed to highstate outputter is not a valid highstate return: %s',
data