[Pkg-owncloud-commits] [owncloud-client] 27/159: Sync engine: Check the blacklist for the right tree

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit dafc2d2b732091e5ad68a70f03d3e0e9bc2e4bc1
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Mar 24 12:17:48 2015 +0100

    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.
---
 src/libsync/syncengine.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 55e2639..ad10daf 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++;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git