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

Only change what is essential for test fix

Browse source 
- Revert change to keep list iteration
- Fix method name typo
This commit is contained in:
Daniel A. Wozniak 2018-03-26 09:55:57 -07:00
parent eb822f5a12
commit cb5619537f
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/states/file.py
View file

@ -263,7 +263,6 @@ For example:
# Import python libs
from __future__ import absolute_import
import collections
import difflib
import itertools
import logging
@ -614,7 +613,7 @@ def _find_keep_files(root, keep):
'''
real_keep = set()
real_keep.add(root)
if isinstance(keep, collections.Iterable):
if isinstance(keep, list):
for fn_ in keep:
if not os.path.isabs(fn_):
continue
@ -634,7 +633,7 @@ def _clean_dir(root, keep, exclude_pat):
Clean out all of the files and directories in a directory (root) while
preserving the files in a list (keep) and part of exclude_pat
'''
real_keep = _find_keep_files_old(root, keep)
real_keep = _find_keep_files(root, keep)
removed = set()
def _delete_not_kept(nfn):
if nfn not in real_keep: