[Pkg-owncloud-commits] [owncloud-client] 20/164: SyncEngine: Fix detection of the server reconfiguration

[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 fb77cd5f7e491e1b43106464c5015997a041504b
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Feb 17 16:41:44 2015 +0100

    SyncEngine: Fix detection of the server reconfiguration
    
    Some files might be kept (like the default files)
    The files should be considered as NONE only if they are NONE on both trees
    
    issue #2847
---
 src/libsync/syncengine.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index a5b47d4..2ff3161 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -416,7 +416,9 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
             dir = SyncFileItem::None;
         } else {
             // No need to do anything.
-            _hasNoneFiles = true;
+            if (file->other.instruction == CSYNC_INSTRUCTION_NONE) {
+                _hasNoneFiles = true;
+            }
 
             emit syncItemDiscovered(item);
             return re;

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