Skip to content

Commit

Permalink
Merge pull request #23810 from rallytime/bp-23757
Browse files Browse the repository at this point in the history
Backport #23757 to 2014.7
  • Loading branch information
jfindlay committed May 18, 2015
2 parents 6b3352b + fb32c32 commit aee00c8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions salt/states/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ def _is_child(path, directory):
'''
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)

Expand Down

0 comments on commit aee00c8

Please sign in to comment.