From 3cbe2caa17a703d968427ce621fc876d9a8b497f Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 7 May 2024 19:07:49 +0200 Subject: [PATCH] fix regression with VFS update metadata instruction Signed-off-by: Matthieu Gallien --- src/libsync/discovery.cpp | 1 + test/testsynccfapi.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index 26ba91adb7d72..91d717c0feaba 100644 --- 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 fa47395ec0d62..d537951e9eb4a 100644 --- 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();