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

Use msgpack utils for loads call, import msgpack for UnpackValueError

Browse source
This commit is contained in:
rallytime 2018-04-11 14:38:32 -04:00
parent 34a478dfe5
commit ba70df9d62
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/state.py
View file

@ -54,6 +54,7 @@ from salt.utils.locales import sdecode
import salt.utils.yamlloader as yamlloader
# Import third party libs
import msgpack
# pylint: disable=import-error,no-name-in-module,redefined-builtin
from salt.ext import six
from salt.ext.six.moves import map, range, reload_module
@ -2156,7 +2157,7 @@ class State(object):
tries = 0
with salt.utils.files.fopen(pause_path, 'rb') as fp_:
try:
pdat = msgpack.loads(fp_.read())
pdat = msgpack_deserialize(fp_.read())
except msgpack.UnpackValueError:
# Reading race condition
if tries > 10: