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

Prevent crash during externally changed archive permissions

Browse source
This commit is contained in:
Bo Maryniuk 2016-11-28 22:20:51 +01:00
parent 91b42578b2
commit 1970814111
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/archive.py
View file

@ -909,7 +909,13 @@ def extracted(name,
if extraction_needed:
destination = os.path.join(name, contents['top_level_dirs'][0])
if os.path.exists(destination):
shutil.rmtree(destination)
try:
shutil.rmtree(destination)
except OSError as err:
ret['comment'] = 'Error removing destination directory ' \
'"{0}": {1}'.format(destination, err)
ret['result'] = False
return ret
try:
if_missing_path_exists = os.path.exists(if_missing)