[Pkg-owncloud-commits] [owncloud-client] 426/498: Do not add all remote directories to the SyncItemVector

[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 78b63c34cb096abcf7a03484c455ff9ecff75693
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Fri Jul 31 21:18:03 2015 +0200

    Do not add all remote directories to the SyncItemVector
    
    To allow forwarding all OK states of sync jobs to the socket API
    we need to make sure that the vector doesn't contain unneeded items.
    
    This initially was intended to force updating the metadata for parent
    folders, but since then the should_update_metadata flag check was
    added both here and in PropagateDirectory::finalize where the metadata
    is actually updated for parent folders. We can safely remove the inclusion
    of all remote directory items.
---
 src/libsync/syncengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index f9bdfcc..76f6eda 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -462,7 +462,7 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
             _journal->setFileRecord(SyncJournalFileRecord(*item, _localPath + item->_file));
             item->_should_update_metadata = false;
         }
-        if (item->_isDirectory && (remote || file->should_update_metadata)) {
+        if (item->_isDirectory && file->should_update_metadata) {
             // Because we want still to update etags of directories
             dir = SyncFileItem::None;
         } else {

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