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

Browse source
This commit is contained in:
Viet Hung Nguyen 2015-03-14 15:59:34 +07:00
parent 5759a0e8f0
commit d3060a51a3
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
salt/states/file.py
View file

@ -495,25 +495,21 @@ def _check_directory(name,
changes[name] = fchange
if clean:
keep = _gen_keep_files(name, require)
def _check_changes(fname):
path = os.path.join(root, fname)
if path not in keep:
if not salt.utils.check_include_exclude(
path[len(name) + 1:], None, exclude_pat):
return {}
return {path: {'removed': 'Removed due to clean'}}
return {}
for root, dirs, files in os.walk(name):
for fname in files:
fchange = {}
path = os.path.join(root, fname)
if path not in keep:
if not salt.utils.check_include_exclude(
path[len(name) + 1:], None, exclude_pat):
continue
fchange['removed'] = 'Removed due to clean'
changes[path] = fchange
changes.update(_check_changes(fname))
for name_ in dirs:
fchange = {}
path = os.path.join(root, name_)
if path not in keep:
if not salt.utils.check_include_exclude(
path[len(name) + 1:], None, exclude_pat):
continue
fchange['removed'] = 'Removed due to clean'
changes[path] = fchange
changes.update(_check_changes(name_))
if not os.path.isdir(name):
changes[name] = {'directory': 'new'}