diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-02-21 13:13:22 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-02-21 15:38:44 +0100 |
commit | 8b505a01e1529ad92e3020ec37f54b28971e847d (patch) | |
tree | b25f03dba57aba3b2fb0c82a6d4c27f7b0d71002 | |
parent | 9bc52b6f5645ed9cc8471a9d666e6bc6cd11a2de (diff) |
cleanup operation run output
Change-Id: I24fefcabfe0d589a4e26930d355a593b22f2e3e2
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 28 |
1 files changed, 20 insertions, 8 deletions
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"); |