[Pkg-owncloud-commits] [owncloud-client] 104/219: journaldb: Assert in case of SQL error

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:15 UTC 2014


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 97cc05eeea3da08ee01578b1604ed0bc3b0b7d7e
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Sep 15 14:27:39 2014 +0200

    journaldb:  Assert in case of SQL error
    
    relates issue #2106
---
 src/mirall/syncjournaldb.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp
index 7e5acf1..ac0a4e7 100644
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -80,8 +80,14 @@ void SyncJournalDb::commitTransaction()
 bool SyncJournalDb::sqlFail( const QString& log, const QSqlQuery& query )
 {
     commitTransaction();
-    qWarning() << "Error" << log << query.lastError().text();
+#ifdef NDEBUG
+    qWarning()
+#else
+    qFatal()
+#endif
+        << "SQL Error" << log << query.lastError().text();
 
+    _db.close();
     return false;
 }
 

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



More information about the Pkg-owncloud-commits mailing list