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

refactor: use relpath instead of do it manually

Browse source
This commit is contained in:
Viet Hung Nguyen 2015-03-14 17:01:42 +07:00
parent d3060a51a3
commit 8924b5a911
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/file.py
View file

@ -397,7 +397,7 @@ def _clean_dir(root, keep, exclude_pat):
# -- 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):
os.path.relpath(nfn, root), None, exclude_pat):
continue
removed.add(nfn)
if not __opts__['test']:
@ -408,7 +408,7 @@ def _clean_dir(root, keep, exclude_pat):
# -- 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):
os.path.relpath(nfn, root), None, exclude_pat):
continue
removed.add(nfn)
if not __opts__['test']: