a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure stat of dest is available in atomic_move 

Fixes #6682
pull/4420/head
James Cammarata 2014-03-25 13:00:38 -05:00
parent adbd6865da
commit 4ea12c1b86
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ansible/module_utils/basic.py
View File

@ -966,11 +966,12 @@ class AnsibleModule(object):
it uses os.rename to ensure this as it is an atomic operation, rest of the function is it uses os.rename to ensure this as it is an atomic operation, rest of the function is
to work around limitations, corner cases and ensure selinux context is saved if possible''' to work around limitations, corner cases and ensure selinux context is saved if possible'''
context = None context = None
dest_stat = None
if os.path.exists(dest): if os.path.exists(dest):
try: try:
st = os.stat(dest) dest_stat = os.stat(dest)
os.chmod(src, st.st_mode & 07777) os.chmod(src, dest_stat.st_mode & 07777)
os.chown(src, st.st_uid, st.st_gid) os.chown(src, dest_stat.st_uid, dest_stat.st_gid)
except OSError, e: except OSError, e:
if e.errno != errno.EPERM: if e.errno != errno.EPERM:
raise raise
@ -1005,9 +1006,8 @@ class AnsibleModule(object):
if self.selinux_enabled(): if self.selinux_enabled():
self.set_context_if_different( self.set_context_if_different(
tmp_dest.name, context, False) tmp_dest.name, context, False)
# Reset owners, they are not preserved by shutil.copy2(), which if dest_stat:
# is what shutil.move() falls back to. os.chown(tmp_dest.name, dest_stat.st_uid, dest_stat.st_gid)
os.chown(tmp_dest.name, st.st_uid, st.st_gid)
os.rename(tmp_dest.name, dest) os.rename(tmp_dest.name, dest)
except (shutil.Error, OSError, IOError), e: except (shutil.Error, OSError, IOError), e:
self.cleanup(tmp_dest.name) self.cleanup(tmp_dest.name)