[Pkg-owncloud-commits] [ocsync] 05/29: Do not 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 ocsync.

commit 7300f10f87fac188510846a201ee7f0bac02e762
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Dec 9 10:33:50 2013 +0100

    Do not recurse into ignored directory
    
    Fix mirall issue 1260
---
 src/csync_update.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/csync_update.c b/src/csync_update.c
index 6792ac5..15d3ee8 100644
--- a/src/csync_update.c
+++ b/src/csync_update.c
@@ -601,7 +601,8 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
       goto done;
     }
 
-    if (flag == CSYNC_FTW_FLAG_DIR && depth) {
+    if (flag == CSYNC_FTW_FLAG_DIR && depth
+        && (!ctx->current_fs || ctx->current_fs->instruction != CSYNC_INSTRUCTION_IGNORE)) {
       rc = csync_ftw(ctx, filename, fn, depth - 1);
       if (rc < 0) {
         ctx->current_fs = previous_fs;

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