From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 24 Mar 2015 11:17:48 +0000 (+0100)
Subject: Sync engine: Check the blacklist for the right tree
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1890^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dafc2d2b732091e5ad68a70f03d3e0e9bc2e4bc1;p=nextcloud-desktop.git

Sync engine: Check the blacklist for the right tree

When the operation is download, we have a INSTRUCTION_NONE for the local
tree, but we should not check the blacklist just yet.
---

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 55e2639db..ad10daf9c 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -484,9 +484,11 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
     }
 
     item._direction = dir;
-    // check for blacklisting of this item.
-    // if the item is on blacklist, the instruction was set to IGNORE
-    checkErrorBlacklisting( &item );
+    if (instruction != CSYNC_INSTRUCTION_NONE) {
+        // check for blacklisting of this item.
+        // if the item is on blacklist, the instruction was set to ERROR
+        checkErrorBlacklisting( &item );
+    }
 
     if (!item._isDirectory) {
         _progressInfo._totalFileCount++;