Skip to content

Commit

Permalink
Merge pull request #56778 from bryceml/53622
Browse files Browse the repository at this point in the history
Port #53628 into master
  • Loading branch information
dwoz authored Apr 21, 2020
2 parents 0586dd9 + 3c60150 commit b6d3a67
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions salt/utils/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def store_job(opts, load, event=None, mminion=None):
nocache=load.get("nocache", False)
)
except KeyError:
emsg = "Returner '{0}' does not support function prep_jid".format(job_cache)
emsg = "Returner function not found: {0}".format(prep_fstr)
log.error(emsg)
raise KeyError(emsg)

Expand All @@ -53,9 +53,7 @@ def store_job(opts, load, event=None, mminion=None):
try:
mminion.returners[saveload_fstr](load["jid"], load)
except KeyError:
emsg = "Returner '{0}' does not support function save_load".format(
job_cache
)
emsg = "Returner function not found: {0}".format(saveload_fstr)
log.error(emsg)
raise KeyError(emsg)
elif salt.utils.jid.is_jid(load["jid"]):
Expand Down

0 comments on commit b6d3a67

Please sign in to comment.