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

Merge pull request #12962 from dr4Ke/fix_file_directory_clean_symlinks

Browse Source 
file.directory: fix cleaning directory symlinks
This commit is contained in:
Thomas S Hatch 2014-05-23 11:50:48 -06:00
commit e5db465f50
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/states/file.py
View File

@ -318,6 +318,22 @@ def _clean_dir(root, keep, exclude_pat):
break
for roots, dirs, files in os.walk(root):
for name in dirs:
nfn = os.path.join(roots, name)
if os.path.islink(nfn):
# the "directory" is in fact a symlink and cannot be
# removed by shutil.rmtree
files.append(nfn)
continue
if nfn not in real_keep:
# -- check if this is a part of exclude_pat(only). No need to
# check include_pat
if not salt.utils.check_include_exclude(
nfn[len(root) + 1:], None, exclude_pat):
continue
removed.add(nfn)
if not __opts__['test']:
shutil.rmtree(nfn)
for name in files:
nfn = os.path.join(roots, name)
if nfn not in real_keep:
@ -329,17 +345,6 @@ def _clean_dir(root, keep, exclude_pat):
removed.add(nfn)
if not __opts__['test']:
os.remove(nfn)
for name in dirs:
nfn = os.path.join(roots, name)
if nfn not in real_keep:
# -- check if this is a part of exclude_pat(only). No need to
# check include_pat
if not salt.utils.check_include_exclude(
nfn[len(root) + 1:], None, exclude_pat):
continue
removed.add(nfn)
if not __opts__['test']:
shutil.rmtree(nfn)
return list(removed)