valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tmp file clean up in file.manage - fix for #33708

Browse Source
This commit is contained in:
Eric Cook 2016-12-03 01:15:59 -05:00
parent 723699fda9
commit 48c4ee6f31
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/states/file.py
View File

@ -2112,11 +2112,15 @@ def managed(name,
ret.update(cret) ret.update(cret)
if os.path.isfile(tmp_filename): if os.path.isfile(tmp_filename):
os.remove(tmp_filename) os.remove(tmp_filename)
if sfn and os.path.isfile(sfn):
os.remove(sfn)
return ret return ret
# Since we generated a new tempfile and we are not returning here # Since we generated a new tempfile and we are not returning here
# lets change the original sfn to the new tempfile or else we will # lets change the original sfn to the new tempfile or else we will
# get file not found # get file not found
sfn = tmp_filename if sfn and os.path.isfile(sfn):
os.remove(sfn)
sfn = tmp_filename
else: else:
ret = {'changes': {}, ret = {'changes': {},
'comment': '', 'comment': '',
@ -2158,6 +2162,8 @@ def managed(name,
finally: finally:
if tmp_filename and os.path.isfile(tmp_filename): if tmp_filename and os.path.isfile(tmp_filename):
os.remove(tmp_filename) os.remove(tmp_filename)
if sfn and os.path.isfile(sfn):
os.remove(sfn)
_RECURSE_TYPES = ['user', 'group', 'mode', 'ignore_files', 'ignore_dirs'] _RECURSE_TYPES = ['user', 'group', 'mode', 'ignore_files', 'ignore_dirs']