fix regression with VFS update metadata instruction

Signed-off-by: Matthieu Gallien <[email protected]>
nextcloud · May 14, 2024 · ee28255 · ee28255
1 parent bbe9712
commit ee28255
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
@@ -1685,6 +1685,7 @@ void ProcessDirectoryJob::processFileFinalize(
 
     if (_discoveryData->_syncOptions._vfs &&
         item->_type == CSyncEnums::ItemTypeFile &&
+        item->_instruction == CSyncEnums::CSYNC_INSTRUCTION_NONE &&
         !_discoveryData->_syncOptions._vfs->isPlaceHolderInSync(_discoveryData->_localDir + path._local)) {
         item->_instruction = CSyncEnums::CSYNC_INSTRUCTION_UPDATE_VFS_METADATA;
     }

diff --git a/test/testsynccfapi.cpp b/test/testsynccfapi.cpp
@@ -411,7 +411,6 @@ private slots:
         fakeFolder.localModifier().insert("A/a3");
         fakeFolder.remoteModifier().appendByte("A/a2");
         QVERIFY(fakeFolder.syncOnce());
-        QEXPECT_FAIL("", "", Abort);
         QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
         cleanup();