fix regression with VFS update metadata instruction

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 26ba91adb7d72ca4506bbe94d391096ec731b9f1..91d717c0feababfa64e7fb8e586b22d73629cf67 100644 (file)
--- 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
index fa47395ec0d62ef85ff7c3ee2a811b1d5790aaf0..d537951e9eb4a8ad89abc553a9c6e5d76e0cc5a2 100644 (file)
--- 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();