summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-08-26 12:55:14 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-08-26 12:55:14 (GMT)
commit59c3247073d916bd53f281ab8db7a1457f02dddf (patch)
tree0565b07f41c53da50f70082903eefa4ce494fab5
parent9d1d7cdff89b6a0cd4b77fa83b59830279fe117f (diff)
AKAPPEND: Improve debug output in case of 'Multiple merge candidates' error
-rw-r--r--src/server/handler/akappend.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/handler/akappend.cpp b/src/server/handler/akappend.cpp
index 95d1b49..a037d30 100644
--- a/src/server/handler/akappend.cpp
+++ b/src/server/handler/akappend.cpp
@@ -407,7 +407,10 @@ bool AkAppend::parseStream()
} else {
qCDebug(AKONADISERVER_LOG) << "Multiple merge candidates:";
Q_FOREACH (const PimItem &item, result) {
- qCDebug(AKONADISERVER_LOG) << "\t ID: " << item.id() << ", RID:" << item.remoteId() << ", GID:" << item.gid();
+ qCDebug(AKONADISERVER_LOG, "\tID: %ll, RID: %s, GID: %s, Collection: %s (%ll), Resource: %s (%ll)",
+ item.id(), qPrintable(item.remoteId()), qPrintable(item.gid()),
+ qPrintable(item.collection().name()), item.collectionId(),
+ qPrintable(item.collection().resource().name()), item.collection().resource().id());
}
// Nor GID or RID are guaranteed to be unique, so make sure we don't merge
// something we don't want