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

Merge pull request #48662 from slaws/fix-retention-schedule-48637

Browse source 
Excluding relative dirs in state.file.retention_schedule
This commit is contained in:
Nicole Thomas 2018-07-31 12:15:08 -04:00 • committed by GitHub
commit 136ff6735a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/file.py
View file

@ -3737,6 +3737,8 @@ def retention_schedule(name, retain, strptime_format=None, timezone=None):
return (None, None)
def get_file_time_from_mtime(f):
if f == '.' or f == '..':
return (None, None)
lstat = __salt__['file.lstat'](os.path.join(name, f))
if lstat:
mtime = lstat['st_mtime']