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

Skip malformed files during reaping. We can just as easily catch them the next time.

Browse Source
This commit is contained in:
Mike Place 2013-11-01 13:41:16 -06:00
parent 5abe667471
commit d78afd7ea0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/fileserver/__init__.py
View File

@ -66,7 +66,11 @@ def reap_fileserver_cache_dir(cache_base, find_func):
for file_ in files:
file_path = os.path.join(root, file_)
file_rel_path = os.path.relpath(file_path, env_base)
filename, _, hash_type = file_rel_path.rsplit('.', 2)
try:
filename, _, hash_type = file_rel_path.rsplit('.', 2)
except ValueError:
log.warn('Found invalid hash file [{0}] when attempting to reap cache directory.'.format(file_))
continue
# do we have the file?
ret = find_func(filename, env=env)
# if we don't actually have the file, lets clean up the cache object