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 issue where the name may be in 2 places

Browse source
This commit is contained in:
Thomas S Hatch 2016-01-01 12:40:06 -07:00 • committed by rallytime
parent 5f0326e521
commit fb0cbd185e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/state.py
View file

@ -260,10 +260,14 @@ def mock_ret(cdata):
'''
# As this is expanded it should be sent into the execution module
# layer or it should be turned into a standalone loader system
return = {'name': cdata['name'],
'comment': 'Not called, mocked',
'changes': {},
'result': True}
if cdata['args']:
name = cdata['args'][0]
else:
name = cdata['kwargs']['name']
return {'name': name,
'comment': 'Not called, mocked',
'changes': {},
'result': True}
class StateError(Exception):