Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys: KWSys 2016-03-31 (3392da1d)
This commit is contained in:
commit
168e44e202
|
@ -2855,6 +2855,7 @@ static bool DeleteJunction(const std::wstring& source)
|
|||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
bool SystemTools::RemoveFile(const std::string& source)
|
||||
|
@ -2884,9 +2885,9 @@ bool SystemTools::RemoveFile(const std::string& source)
|
|||
SetLastError(err);
|
||||
return false;
|
||||
}
|
||||
if (IsJunction(ws) && !DeleteJunction(ws))
|
||||
if (IsJunction(ws) && DeleteJunction(ws))
|
||||
{
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
if (DeleteFileW(ws.c_str()) ||
|
||||
GetLastError() == ERROR_FILE_NOT_FOUND ||
|
||||
|
|
Loading…
Reference in New Issue