From 8b505a01e1529ad92e3020ec37f54b28971e847d Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Thu, 21 Feb 2013 13:13:22 +0100
Subject: cleanup operation run output

Change-Id: I24fefcabfe0d589a4e26930d355a593b22f2e3e2
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 src/libs/installer/packagemanagercore_p.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'src/libs/installer')

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index d93eba0b6..3bdb73ae0 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -82,30 +82,42 @@ namespace QInstaller {
 class OperationTracer
 {
 public:
-    OperationTracer() {}
-    void trace(Operation *operation, const QString &state)
+    OperationTracer(Operation *operation) : m_operation(0)
     {
-        qDebug() << state << " operation: " << operation->name();
-        qDebug() << "   - arguments: " << operation->arguments().join(QLatin1String(", "));
+        // don't create output for that hacky pseudo operation
+        if (operation->name() != QLatin1String("MinimumProgress"))
+            m_operation = operation;
+    }
+    void trace(const QString &state)
+    {
+        if (!m_operation)
+            return;
+        qDebug() << QString::fromLatin1("%1 operation: %2").arg(state, m_operation->name());
+        qDebug() << QString::fromLatin1("\t- arguments: %1").arg(m_operation->arguments()
+            .join(QLatin1String(", ")));
     }
     ~OperationTracer() {
+        if (!m_operation)
+            return;
         qDebug() << "Done";
     }
+private:
+    Operation *m_operation;
 };
 
 static bool runOperation(Operation *operation, PackageManagerCorePrivate::OperationType type)
 {
-    OperationTracer tracer;
+    OperationTracer tracer(operation);
     switch (type) {
         case PackageManagerCorePrivate::Backup:
-            tracer.trace(operation, QLatin1String("backup"));
+            tracer.trace(QLatin1String("backup"));
             operation->backup();
             return true;
         case PackageManagerCorePrivate::Perform:
-            tracer.trace(operation, QLatin1String("perform"));
+            tracer.trace(QLatin1String("perform"));
             return operation->performOperation();
         case PackageManagerCorePrivate::Undo:
-            tracer.trace(operation, QLatin1String("undo"));
+            tracer.trace(QLatin1String("undo"));
             return operation->undoOperation();
         default:
             Q_ASSERT(!"unexpected operation type");
-- 
cgit v1.2.3