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

Munge retcode into return data for batching

Browse source
This commit is contained in:
Mike Place 2017-01-17 11:31:45 -07:00
parent a642a995dc
commit db81afc035
No known key found for this signature in database
GPG key ID: 9136F4F13705CFD3
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/cli/batch.py
View file

@ -223,6 +223,9 @@ class Batch(object):
active.remove(minion)
if bwait:
wait.append(datetime.now() + timedelta(seconds=bwait))
# Munge retcode into return data
if 'retcode' in data and isinstance(data['ret'], dict) and 'retcode' not in data['ret']:
data['ret']['retcode'] = data['retcode']
if self.opts.get('raw'):
ret[minion] = data
yield data