mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Discovery: fix TestSyncVirtualFiles::testExtraFilesLocalDehydrated on windows

Browse Source 
On windows we do a test to know if we should change the case of the files,
but that conflict with the test that checks if the file was still there
when the filename is actually the same. Which can happen with virtual files
as they have two representation (the one with and without suffix).
This commit is contained in:
Olivier Goffart 2019-10-31 10:41:38 +01:00 committed by Kevin Ottens
parent ca18bbc2ca
commit fc0aeb53b1
No known key found for this signature in database
GPG Key ID: 074BBBCB8DECC9E2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libsync/discovery.cpp
View File

@ -892,11 +892,12 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
}
// The old file must have been deleted.
if (QFile::exists(_discoveryData->_localDir + base._path)
if (QFile::exists(_discoveryData->_localDir + originalPath)
// Exception: If the rename changes case only (like "foo" -> "Foo") the
// old filename might still point to the same file.
&& !(Utility::fsCasePreserving()
&& originalPath.compare(path._local, Qt::CaseInsensitive) == 0)) {
&& originalPath.compare(path._local, Qt::CaseInsensitive) == 0
&& originalPath != path._local)) {
qCInfo(lcDisco) << "Not a move, base file still exists at" << originalPath;
return false;
}