[Pkg-owncloud-commits] [owncloud-client] 101/115: Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree

[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 aabcf807744f322be5b63c966b7750a0003c8b25
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Aug 21 11:33:38 2014 +0200

    Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree
---
 src/mirall/syncengine.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index 2879bf3..d282df4 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -265,7 +265,8 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
     item._file = fileUtf8;
     item._originalFile = item._file;
 
-    if (item._instruction == CSYNC_INSTRUCTION_NONE) {
+    if (item._instruction == CSYNC_INSTRUCTION_NONE
+            || (item._instruction == CSYNC_INSTRUCTION_IGNORE && file->instruction != CSYNC_INSTRUCTION_NONE)) {
         item._instruction = file->instruction;
         item._modtime = file->modtime;
     } else {

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