[Pkg-owncloud-commits] [owncloud-client] 165/219: csync_update: don't recurse into ignored directory.

[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 fe1653ede64be641252d5d6ae20cbb5dc8adc1f1
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Sep 26 12:35:12 2014 +0200

    csync_update:  don't recurse into ignored directory.
    
    This save some time when selective sync deselected a large tree
---
 csync/src/csync_update.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c
index 7a15cd8..389914b 100644
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -146,10 +146,10 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
   if (excluded != CSYNC_NOT_EXCLUDED) {
     CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s excluded  (%d)", path, excluded);
     if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE) {
-        return 0;
+        return 1;
     }
     if (excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
-        return 0;
+        return 1;
     }
 
     if (ctx->current_fs) {
@@ -159,7 +159,7 @@ 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;
+          return 1;
       }
   }
 
@@ -690,7 +690,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
       goto error;
     }
 
-    if (flag == CSYNC_FTW_FLAG_DIR && depth
+    if (flag == CSYNC_FTW_FLAG_DIR && depth && rc == 0
         && (!ctx->current_fs || ctx->current_fs->instruction != CSYNC_INSTRUCTION_IGNORE)) {
       rc = csync_ftw(ctx, filename, fn, depth - 1);
       if (rc < 0) {

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