[Pkg-owncloud-commits] [owncloud-client] 12/69: SyncEngine: Log for an assert, return -1 for nondebug compile

[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 05ceed926c9ddf460d67bcdcfb29afe2c81363f5
Author: Markus Goetz <markus at woboq.com>
Date:   Mon Oct 27 15:52:17 2014 +0100

    SyncEngine: Log for an assert, return -1 for nondebug compile
---
 src/mirall/syncengine.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index 1d87b3b..db632d2 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -325,7 +325,9 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
         item._modtime = file->modtime;
     } else {
         if (file->instruction != CSYNC_INSTRUCTION_NONE) {
+            qDebug() << "ERROR: Instruction" << item._instruction << "vs" << file->instruction << "for" << fileUtf8;
             Q_ASSERT(!"Instructions are both unequal NONE");
+            return -1;
         }
     }
 

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