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

Don't always remove dest path in salt.utils.files.rename()

Browse Source 
This prevents an extra system call on non-Windows platforms.
This commit is contained in:
Erik Johnson 2015-09-25 13:53:53 -05:00
parent b72e0b1133
commit 7bc0949d48
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
salt/utils/files.py
View File

@ -93,14 +93,22 @@ def copyfile(source, dest, backup_mode='', cachedir=''):
def rename(src, dst):
'''
On Windows, os.rename() will fail with a WindowsError exception if a file
exists at the destination path. This function removes the destination path
first before attempting the os.rename().
exists at the destination path. This function checks for this error and if
found, it deletes the destination path first.
'''
try:
os.remove(dst)
os.rename(src, dst)
except OSError as exc:
if exc.errno != errno.ENOENT:
raise MinionError(
'Error: Unable to remove {0}: {1}'.format(dst, exc.strerror)
)
os.rename(src, dst)
if exc.errno != errno.EEXIST:
raise
try:
os.remove(dst)
except OSError as exc:
if exc.errno != errno.ENOENT:
raise MinionError(
'Error: Unable to remove {0}: {1}'.format(
dst,
exc.strerror
)
)
os.rename(src, dst)