summaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-07-25 17:59:02 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-07-26 13:19:24 +0200
commit9ea0a22fb01931eb3590818091c1761bfa413d1c (patch)
treecd8abc01a622c15f47658ae24b397b93156b4115 /src/libs
parent2b10d950fb1331a2019a8806aa8317ec0895adf9 (diff)
add component name to operation debug output
- set the component name to every operation which comes from a component Change-Id: I3e4a1ab2896f7b469fe6606c7e89127c3d6fbc43 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/installer/component.cpp2
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index cfa220ab1..79347d12b 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -995,7 +995,7 @@ Operation *Component::createOperation(const QString &operationName, const QStrin
operation->setValue(QLatin1String("installer"), qVariantFromValue(d->m_core));
operation->setArguments(d->m_core->replaceVariables(parameters));
-
+ operation->setValue(QLatin1String("component"), name());
return operation;
}
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index bf15f67bb..639eb2189 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -95,7 +95,8 @@ public:
{
if (!m_operation)
return;
- qDebug() << QString::fromLatin1("%1 operation: %2").arg(state, m_operation->name());
+ qDebug() << QString::fromLatin1("%1 %2 operation: %3").arg(state, m_operation->value(
+ QLatin1String("component")).toString(), m_operation->name());
qDebug() << QString::fromLatin1("\t- arguments: %1").arg(m_operation->arguments()
.join(QLatin1String(", ")));
}
@@ -1864,7 +1865,6 @@ void PackageManagerCorePrivate::installComponent(Component *component, double pr
// Remember that the operation was performed, that allows us to undo it if a following operation
// fails or if this operation failed but still needs an undo call to cleanup.
addPerformed(operation);
- operation->setValue(QLatin1String("component"), component->name());
}
if (becameAdmin)