[Pkg-owncloud-commits] [owncloud-client] 34/164: SyncEngine: Fix move would re-upload the file

[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 5e1aa7d3831898c088fa1452e5cade14bed07a1f
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Feb 19 15:00:37 2015 +0100

    SyncEngine: Fix move would re-upload the file
    
    Because SyncJournalDb::postSyncCleanup was deleting the entries in the database
---
 src/libsync/syncengine.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 6c1b741..accf44e 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -341,6 +341,10 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
 
     // record the seen files to be able to clean the journal later
     _seenFiles.insert(item._file);
+    if (!renameTarget.isEmpty()) {
+        // Yes, this record both the rename renameTarget and the original so we keep both in case of a rename
+        _seenFiles.insert(renameTarget);
+    }
 
     if (remote && file->remotePerm && file->remotePerm[0]) {
         _remotePerms[item._file] = file->remotePerm;

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