[Pkg-owncloud-commits] [owncloud-client] 25/135: Download: Retrigger folder discovery on 404

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository owncloud-client.

commit 577a2715bde1e958fb1ee78041c42581d6a5ee11
Author: Christian Kamm <mail at ckamm.de>
Date:   Mon May 29 12:05:22 2017 +0200

    Download: Retrigger folder discovery on 404
    
    See owncloud/enterprise#1966
    
    If the server and the client's database go out of sync, there could be
    persistent 404 errors. This change ensures that the problem corrects
    itself eventually by triggering a remote discovery of the file's
    parent folders.
    
    It does not address the root cause that might have lead to the
    divergence.
---
 src/libsync/propagatedownload.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index e87e3d4..0ad605d 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -500,6 +500,11 @@ void PropagateDownloadFile::slotGetFinished()
         } else if (fileNotFound) {
             job->setErrorString(tr("File was deleted from server"));
             job->setErrorStatus(SyncFileItem::SoftError);
+
+            // As a precaution against bugs that cause our database and the
+            // reality on the server to diverge, rediscover this folder on the
+            // next sync run.
+            propagator()->_journal->avoidReadFromDbOnNextSync(_item->_file);
         }
 
         SyncFileItem::Status status = job->errorStatus();

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