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

update chunk, not kwarg in chunk

Browse source
This commit is contained in:
Daniel Wallace 2017-07-25 14:05:58 -06:00 • committed by rallytime
parent 46715e9d94
commit 2868061ee4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/state.py
View file

@ -571,14 +571,14 @@ class Compiler(object):
if state.startswith('__'):
continue
chunk = {'state': state,
'name': name}
'name': name,
'arg': [],
'kwarg': {}}
if '__sls__' in body:
chunk['__sls__'] = body['__sls__']
if '__env__' in body:
chunk['__env__'] = body['__env__']
chunk['__id__'] = name
chunk['arg'] = []
chunk['kwarg'] = {}
for arg in run:
if isinstance(arg, six.string_types):
funcs.add(arg)
@ -591,7 +591,7 @@ class Compiler(object):
names.append(_name)
continue
else:
chunk['kwarg'].update(arg)
chunk.update(arg)
if names:
name_order = 1
for entry in names: