[Pkg-owncloud-commits] [owncloud-client] 278/470: SyncEngine: finalize properly on error with syncjournal

[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 e4604b406ffba4241beebe794f18839b6e0a8d8d
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Apr 6 17:20:48 2016 +0200

    SyncEngine: finalize properly on error with syncjournal
---
 src/libsync/syncengine.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 46943ee..385521c 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -740,6 +740,9 @@ void SyncEngine::startSync()
         qDebug() << Q_FUNC_INFO << (usingSelectiveSync ? "====Using Selective Sync" : "====NOT Using Selective Sync");
     } else {
         qDebug() << Q_FUNC_INFO << "Could not retrieve selective sync list from DB";
+        emit csyncError(tr("Unable to read the blacklist from the local database"));
+        finalize(false);
+        return;
     }
     csync_set_userdata(_csync_ctx, this);
 
@@ -770,6 +773,8 @@ void SyncEngine::startSync()
     if (!ok) {
         delete discoveryJob;
         qDebug() << Q_FUNC_INFO << "Unable to read selective sync list, aborting.";
+        emit csyncError(tr("Unable to read from the sync journal."));
+        finalize(false);
         return;
     }
 

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