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

Gate msgpack in salt/modules/saltutil.py

Browse source
This commit is contained in:
Colton Myers 2015-04-17 14:33:19 -06:00
parent 02303b22ce
commit d4da8e66a4
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/modules/saltutil.py
View file

@ -522,7 +522,11 @@ def find_cached_job(jid):
buf = fp_.read()
fp_.close()
if buf:
data = serial.loads(buf)
try:
data = serial.loads(buf)
except NameError:
# msgpack error in salt-ssh
return
else:
return
if not isinstance(data, dict):