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

Merge pull request #2817 from sfromm/issue2810

Browse source 
Set selinux context on file after shutil.move in atomic_move()
This commit is contained in:
Michael DeHaan 2013-05-03 06:45:42 -07:00
commit 4ecc7ea2e0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_common.py
View file

@ -820,11 +820,9 @@ class AnsibleModule(object):
raise
if self.selinux_enabled():
context = self.selinux_context(dest)
self.set_context_if_different(src, context, False)
else:
if self.selinux_enabled():
context = self.selinux_default_context(dest)
self.set_context_if_different(src, context, False)
# Ensure file is on same partition to make replacement atomic
dest_dir = os.path.dirname(dest)
dest_file = os.path.basename(dest)
@ -839,6 +837,8 @@ class AnsibleModule(object):
try:
shutil.move(src, tmp_dest)
if self.selinux_enabled():
self.set_context_if_different(tmp_dest, context, False)
os.rename(tmp_dest, dest)
rc = True
except (shutil.Error, OSError, IOError), e: