cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #855 from bcoca/file_rellink_fixes

Browse source 
fixed file module to use realpath when following links,
This commit is contained in:
Brian Coca 2015-02-26 21:07:35 -05:00
commit 0cc15866c2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
files/file.py
View file

@ -201,7 +201,7 @@ def main():
if state in ['link','hard']: if state in ['link','hard']:
if follow and state == 'link': if follow and state == 'link':
# use the current target of the link as the source # use the current target of the link as the source
src = os.readlink(path) src = os.path.realpath(path)
else: else:
module.fail_json(msg='src and dest are required for creating links') module.fail_json(msg='src and dest are required for creating links')
@ -245,7 +245,7 @@ def main():
if state != prev_state: if state != prev_state:
if follow and prev_state == 'link': if follow and prev_state == 'link':
# follow symlink and operate on original # follow symlink and operate on original
path = os.readlink(path) path = os.path.realpath(path)
prev_state = get_state(path) prev_state = get_state(path)
file_args['path'] = path file_args['path'] = path
@ -258,7 +258,7 @@ def main():
elif state == 'directory': elif state == 'directory':
if follow and prev_state == 'link': if follow and prev_state == 'link':
path = os.readlink(path) path = os.path.realpath(path)
prev_state = get_state(path) prev_state = get_state(path)
if prev_state == 'absent': if prev_state == 'absent':