[Pkg-owncloud-commits] [owncloud-client] 46/83: Only set should_update_etag for directories in the update case

[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 3228fde4af8a09b2c6be8011a1d121cb001f8aea
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon May 26 16:09:39 2014 +0200

    Only set should_update_etag for directories in the update case
    
    If there is an error during the local rename for a file, we don't
    want to write the entry for the destination before because there might be
    an error
---
 csync/src/csync_update.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c
index a7000c5..3ec6b19 100644
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -669,7 +669,8 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
       }
     }
 
-    if (ctx->current_fs && (ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL ||
+    if (flag == CSYNC_FTW_FLAG_DIR && ctx->current_fs
+        && (ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL ||
             ctx->current_fs->instruction == CSYNC_INSTRUCTION_NEW ||
             ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL_RENAME)) {
         ctx->current_fs->should_update_etag = true;

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