[Pkg-owncloud-commits] [owncloud-client] 168/498: Reconcile: Update db entry for new dirs. #2761

[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 5f442187270bf963fb543ad8c6ed9bdebf826220
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Thu Jun 4 14:52:00 2015 +0200

    Reconcile: Update db entry for new dirs. #2761
    
    Previously a EVAL_RENAME that was changed to NEW could end up
    being propagated but not added to the database.
---
 csync/src/csync_reconcile.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/csync/src/csync_reconcile.c b/csync/src/csync_reconcile.c
index 861910f..8b557d0 100644
--- a/csync/src/csync_reconcile.c
+++ b/csync/src/csync_reconcile.c
@@ -181,6 +181,12 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
 
                 if(!other) {
                     cur->instruction = CSYNC_INSTRUCTION_NEW;
+                    if (cur->type == CSYNC_FTW_TYPE_DIR) {
+                        // For new directories we always want to update the etag once
+                        // the directory has been propagated. Otherwise the directory
+                        // could appear locally without being added to the database.
+                        cur->should_update_etag = true;
+                    }
                 } else if (other->instruction == CSYNC_INSTRUCTION_NONE
                            || cur->type == CSYNC_FTW_TYPE_DIR) {
                     other->instruction = CSYNC_INSTRUCTION_RENAME;

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