From 24671447746a15a4d3c09b30f91b3251ac40b4e8 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Wed, 10 Jun 2015 16:44:10 +0200 Subject: Fix missing operation 'installer' value and update documentation. Commit 478a8a1db3eed2 was done under the assumption that after UpdateOperation::fromXml(...) existing values are still set. That is wrong and we have to set the 'installer' value again. The same commit was trying to fix the empty 'installer' value in the operations destructor, though the value got removed in PackageManagerCore::writeMaintenanceToolBinaryData() already. We now skip it once we write out the XML. Change-Id: Ia029ae4583862f4cbc6feb1c757604bf7b042a8f Reviewed-by: Kai Koehne --- src/libs/installer/packagemanagercore_p.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/libs/installer/packagemanagercore_p.cpp') diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index a8da31405..ceb1e2f60 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -244,6 +244,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q qWarning() << "Failed to load XML for operation:" << operation.name; continue; } + op->setValue(QLatin1String("installer"), QVariant::fromValue(core)); m_performedOperationsOld.append(op.take()); } @@ -1085,9 +1086,6 @@ void PackageManagerCorePrivate::writeMaintenanceToolBinaryData(QFileDevice *outp const qint64 operationsStart = output->pos(); QInstaller::appendInt64(output, performedOperations.count()); foreach (Operation *operation, performedOperations) { - // the installer can't be put into XML, remove it first - operation->clearValue(QLatin1String("installer")); - QInstaller::appendString(output, operation->name()); QInstaller::appendString(output, operation->toXml().toString()); -- cgit v1.2.3