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

don't break save_load backwards compat

Browse source
This commit is contained in:
Daniel Wallace 2018-06-26 13:32:43 -05:00
parent cfcacf953a
commit d49381c0b6
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/master.py
View file

@ -2211,7 +2211,11 @@ class ClearFuncs(object):
if save_load_func:
try:
self.mminion.returners[fstr](clear_load['jid'], clear_load, minions=minions)
returner_args = [clear_load['jid'], clear_load]
returner_kwargs = {}
if 'minions' in salt.utils.args.get_function_argspec(self.mminion.returners[fstring]).args:
returner_kwargs['minions'] = minions
self.mminion.returners[fstr](*returner_args, **returner_kwargs)
except Exception:
log.critical(
'The specified returner threw a stack trace:\n',