valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression in salt.utils.copyfile()

Browse Source 
In pull request #9599, I added code to make salt.utils.copyfile() set
the ownership and permissions of the new file to those of the
pre-existing file. However, this raises an exception when the
destination file doesn't exist, which happens on file.managed states
which are creating new files.

This commit fixes that regression.
This commit is contained in:
Erik Johnson 2014-01-07 11:47:08 -06:00
parent 9ab823ae05
commit dc01443085
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/utils/__init__.py
View File

@ -642,10 +642,14 @@ def copyfile(source, dest, backup_mode='', cachedir=''):
pass
# Get current file stats to they can be replicated after the new file is
# moved to the destination path.
fstat = os.stat(dest)
try:
fstat = os.stat(dest)
except OSError:
fstat = None
shutil.move(tgt, dest)
os.chown(dest, fstat.st_uid, fstat.st_gid)
os.chmod(dest, fstat.st_mode)
if fstat is not None:
os.chown(dest, fstat.st_uid, fstat.st_gid)
os.chmod(dest, fstat.st_mode)
# If SELINUX is available run a restorecon on the file
rcon = which('restorecon')
if rcon: