ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace_file should allow the replaced file not to exist on Windows.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-24 01:14:56 +01:00
parent c9346d2022
commit b04f3d6994
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/allmydata/util/fileutil.py
View File

@ -588,6 +588,9 @@ if sys.platform == "win32":
REPLACEFILE_IGNORE_MERGE_ERRORS = 0x00000002 REPLACEFILE_IGNORE_MERGE_ERRORS = 0x00000002
# <https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382%28v=vs.85%29.aspx>
ERROR_FILE_NOT_FOUND = 2
def rename_no_overwrite(source_path, dest_path): def rename_no_overwrite(source_path, dest_path):
os.rename(source_path, dest_path) os.rename(source_path, dest_path)
@ -602,7 +605,13 @@ if sys.platform == "win32":
# The UnableToUnlinkReplacementError case does not happen on Windows; # The UnableToUnlinkReplacementError case does not happen on Windows;
# all errors should be treated as signalling a conflict. # all errors should be treated as signalling a conflict.
err = get_last_error() err = get_last_error()
raise ConflictError("WinError: %s" % (WinError(err))) if err != ERROR_FILE_NOT_FOUND:
raise ConflictError("WinError: %s" % (WinError(err),))
try:
rename_no_overwrite(replacement_path, replaced_path)
except EnvironmentError:
reraise(ConflictError)
else: else:
def rename_no_overwrite(source_path, dest_path): def rename_no_overwrite(source_path, dest_path):
# link will fail with EEXIST if there is already something at dest_path. # link will fail with EEXIST if there is already something at dest_path.