[Pkg-owncloud-commits] [owncloud-client] 161/470: Never overwrite the size from the db when updating the metadata

[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 80b5f3f43d8756e7e7cb7d1614c8854ed8ac7b9e
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Oct 8 09:54:43 2015 +0200

    Never overwrite the size from the db when updating the metadata
    
    the size on the server might be different from the size on the client
    with certain backend so it should be ignored.
    
    (cherry picked from commit 9222db6df9b19a21e1bea5a238d745d96a6385e3)
---
 src/libsync/syncengine.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 9f9ad35..9760844 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -494,6 +494,8 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
             // Even if the mtime is different on the server, we always want to keep the mtime from
             // the file system in the DB, this is to avoid spurious upload on the next sync
             item->_modtime = file->other.modtime;
+            // same for the size
+            item->_size = file->other.size;
 
             // If the 'W' remote permission changed, update the local filesystem
             SyncJournalFileRecord prev = _journal->getFileRecord(item->_file);

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