Commit c3547a23 by Michael DeHaan

Moar SELinux.

parent fb7bfa61
...@@ -298,7 +298,7 @@ class AnsibleModule(object): ...@@ -298,7 +298,7 @@ class AnsibleModule(object):
context = ret[1].split(':') context = ret[1].split(':')
return context return context
def selinux_context(self, path) def selinux_context(self, path):
context = self.selinux_initial_context() context = self.selinux_initial_context()
if not HAVE_SELINUX or not self.selinux_enabled(): if not HAVE_SELINUX or not self.selinux_enabled():
return context return context
...@@ -843,7 +843,7 @@ class AnsibleModule(object): ...@@ -843,7 +843,7 @@ class AnsibleModule(object):
os.rename(tmp_dest, dest) os.rename(tmp_dest, dest)
if self.selinux_enabled(): if self.selinux_enabled():
# rename might not preserve context # rename might not preserve context
self.set_context_if_different(tmp_dest, context, False) self.set_context_if_different(dest, context, False)
rc = True rc = True
except (shutil.Error, OSError, IOError), e: except (shutil.Error, OSError, IOError), e:
cleanup() cleanup()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment