From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 16 Oct 2018 12:44:20 +0000 (+0200)
Subject: Discovery: Adjust the instruction in case of resolved conflict
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~487
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=edd866b32b651cccf12fb59645d00b4e24a6c938;p=nextcloud-desktop.git

Discovery: Adjust the instruction in case of resolved conflict

When resolving a conflict because the file was just updated on the server,
we write all the metadata on the database immediatly, so INSTRUCITON_NONE
is enough and UPDATE_METADATA is not needed
---

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index c8dc6aaa1..79a53cde3 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -711,7 +711,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
                     if (up._valid && up._contentChecksum == remoteChecksumHeader) {
                         // Solve the conflict into an upload, or nothing
                         item->_instruction = up._modtime == localEntry.modtime && up._size == localEntry.size
-                            ? CSYNC_INSTRUCTION_UPDATE_METADATA : CSYNC_INSTRUCTION_SYNC;
+                            ? CSYNC_INSTRUCTION_NONE : CSYNC_INSTRUCTION_SYNC;
                         item->_direction = SyncFileItem::Up;
 
                         // Update the etag and other server metadata in the journal already