saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #27418 from terminalmage/file-rename

Browse source 
Don't always remove dest path in salt.utils.files.rename()
This commit is contained in:
Colton Myers 2015-09-25 17:09:59 -06:00
commit 1f4ca089a2
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)