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

Merge pull request #23228 from rallytime/bp-23171

Browse source 
Backport #23171 to 2014.7
This commit is contained in:
Justin Findlay 2015-04-30 15:09:45 -06:00
commit f20210e499
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/utils/schedule.py
View file

@ -779,10 +779,11 @@ def clean_proc_dir(opts):
with salt.utils.fopen(fn_, 'rb') as fp_:
job = None
try:
job_data = fp_.read()
if job_data:
job = salt.payload.Serial(opts).load(fp_)
job = salt.payload.Serial(opts).load(fp_)
except Exception: # It's corrupted
# Windows cannot delete an open file
if salt.utils.is_windows():
fp_.close()
try:
os.unlink(fn_)
continue