kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-atomic-rename-Windows-sharing-violation' into release

This commit is contained in:
Brad King 2014-05-13 15:25:47 -04:00
parent b3ebb8f434 24bd7ae11a
commit 5527cfa002
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmSystemTools.cxx
View File

@ -917,8 +917,10 @@ bool cmSystemTools::RenameFile(const char* oldname, const char* newname)
cmsys::Encoding::ToWide(newname).c_str(), cmsys::Encoding::ToWide(newname).c_str(),
MOVEFILE_REPLACE_EXISTING) && --retry.Count) MOVEFILE_REPLACE_EXISTING) && --retry.Count)
{ {
// Try again only if failure was due to access permissions. DWORD last_error = GetLastError();
if(GetLastError() != ERROR_ACCESS_DENIED) // Try again only if failure was due to access/sharing permissions.
if(last_error != ERROR_ACCESS_DENIED &&
last_error != ERROR_SHARING_VIOLATION)
{ {
return false; return false;
} }