[Pkg-owncloud-commits] [owncloud-client] 30/219: Selective sync: deselecting a folder removes it from the local file system

[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 79d13d92426e241a2092724d3ae73830202c2904
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Aug 28 15:53:49 2014 +0200

    Selective sync:  deselecting a folder removes it from the local file system
---
 csync/src/csync_exclude.c | 6 ------
 csync/src/csync_update.c  | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/csync/src/csync_exclude.c b/csync/src/csync_exclude.c
index 7579df3..8567575 100644
--- a/csync/src/csync_exclude.c
+++ b/csync/src/csync_exclude.c
@@ -150,12 +150,6 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
 
     match = csync_excluded_no_ctx( ctx->excludes, path, filetype );
 
-    if (match == CSYNC_NOT_EXCLUDED && ctx->checkBlackListHook) {
-        if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) {
-            match = CSYNC_FILE_EXCLUDE_LIST;
-        }
-    }
-
     return match;
 }
 
diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c
index 63a2da1..0159b9c 100644
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -163,6 +163,12 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
     }
   }
 
+  if (ctx->current == REMOTE_REPLICA && ctx->checkBlackListHook) {
+      if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) {
+          return 0;
+      }
+  }
+
   h = _hash_of_file(ctx, file );
   if( h == 0 ) {
     return -1;

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