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

Applying c9fb97cc8 (permissions on symlink fix) to v2

Browse source
This commit is contained in:
Toshio Kuratomi 2015-04-27 11:16:19 -05:00 committed by James Cammarata
parent 0303d9ce49
commit 582259f98b
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
v2/ansible/module_utils/basic.py
View file

@ -31,7 +31,7 @@
ANSIBLE_VERSION = "<<ANSIBLE_VERSION>>"
MODULE_ARGS = ""
MODULE_ARGS = "<<INCLUDE_ANSIBLE_MODULE_ARGS>>"
MODULE_COMPLEX_ARGS = "<<INCLUDE_ANSIBLE_MODULE_COMPLEX_ARGS>>"
BOOLEANS_TRUE = ['yes', 'on', '1', 'true', 1]
@ -657,14 +657,25 @@ class AnsibleModule(object):
# FIXME: comparison against string above will cause this to be executed
# every time
try:
if 'lchmod' in dir(os):
if hasattr(os, 'lchmod'):
os.lchmod(path, mode)
else:
os.chmod(path, mode)
if not os.path.islink(path):
os.chmod(path, mode)
else:
# Attempt to set the perms of the symlink but be
# careful not to change the perms of the underlying
# file while trying
underlying_stat = os.stat(path)
os.chmod(path, mode)
new_underlying_stat = os.stat(path)
if underlying_stat.st_mode != new_underlying_stat.st_mode:
os.chmod(path, stat.S_IMODE(underlying_stat.st_mode))
q_stat = os.stat(path)
except OSError, e:
if os.path.islink(path) and e.errno == errno.EPERM: # Can't set mode on symbolic links
pass
elif e.errno == errno.ENOENT: # Can't set mode on broken symbolic links
elif e.errno in (errno.ENOENT, errno.ELOOP): # Can't set mode on broken symbolic links
pass
else:
raise e