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 #23810 from rallytime/bp-23757

Browse source 
Backport #23757 to 2014.7
This commit is contained in:
Justin Findlay 2015-05-18 09:30:21 -06:00
commit aee00c83df
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

@ -321,8 +321,8 @@ def _gen_keep_files(name, require):
'''
Check whether ``path`` is child of ``directory``
'''
path = os.path.realpath(path)
directory = os.path.realpath(directory)
path = os.path.abspath(path)
directory = os.path.abspath(directory)
relative = os.path.relpath(path, directory)