From ea504b9f848324e87bbf1484d9724e0b3afb0de2 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 9 Apr 2013 13:47:44 +0200 Subject: adding the OS attribute to be compatible with old sdks Change-Id: Ia9d9e3371008c77cfcdac04c6da40cd4b9a34fb6 Reviewed-by: Karsten Heimrich --- tools/common/repositorygen.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index dcf6b6133..1549fb896 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -253,6 +253,8 @@ void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QSt QDomElement fileElement = doc.createElement(QLatin1String("UpdateFile")); fileElement.setAttribute(QLatin1String("UncompressedSize"), componentSize); fileElement.setAttribute(QLatin1String("CompressedSize"), compressedComponentSize); + // adding the OS attribute to be compatible with old sdks + fileElement.setAttribute(QLatin1String("OS"), QLatin1String("Any")); update.appendChild(fileElement); root.appendChild(update); -- cgit v1.2.3 From e5d230dac83f41dffe189b2e80a44aeb8553c532 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 11 Apr 2013 10:13:00 +0200 Subject: show the error string not the empty errorString Change autotest accordingly. Change-Id: Ia818cd822954f7022f965f0b504414db9fd56830 Reviewed-by: Tim Jenssen Reviewed-by: Karsten Heimrich --- src/libs/installer/settings.cpp | 2 +- tests/auto/installer/settings/tst_settings.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index ac757ee45..acc664fb4 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -88,7 +88,7 @@ static void raiseError(QXmlStreamReader &reader, const QString &error, Settings: if (xmlFile) { qWarning() << QString::fromLatin1("Ignoring following settings reader error in %1, line %2, " "column %3: %4").arg(xmlFile->fileName()).arg(reader.lineNumber()).arg(reader.columnNumber()) - .arg(reader.errorString()); + .arg(error); } else { qWarning("Ignoring following settings reader error: %s", qPrintable(error)); } diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index dff789d2b..be42a24ae 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -136,7 +136,7 @@ void tst_Settings::loadUnknownElementConfigInStrictParseMode() void tst_Settings::loadUnknownElementConfigInRelaxedParseMode() { QTest::ignoreMessage(QtWarningMsg, "\"Ignoring following settings reader error in " - ":/data/unknown_element_config.xml, line 5, column 13: \" "); + ":/data/unknown_element_config.xml, line 5, column 13: Unexpected element 'unknown'.\" "); try { Settings settings = Settings::fromFileAndPrefix(":/data/unknown_element_config.xml", ":/data", Settings::RelaxedParseMode); -- cgit v1.2.3 From 27161960daec42cb81bdf2c4629ed59cfeafca9e Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 11 Apr 2013 10:12:18 +0200 Subject: we need to continue if the operations is unknown Change-Id: Ife281fabca69af58edae77fc4c413f336535f63c Reviewed-by: Iikka Eklund Reviewed-by: Niels Weber Reviewed-by: Karsten Heimrich --- src/libs/installer/binaryformat.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp index 5022b25a7..c5168dcb8 100644 --- a/src/libs/installer/binaryformat.cpp +++ b/src/libs/installer/binaryformat.cpp @@ -1079,8 +1079,10 @@ int BinaryContent::registerPerformedOperations() for (int i = 0; i < d->m_performedOperationsData.count(); ++ i) { const QPair opPair = d->m_performedOperationsData.at(i); QScopedPointer op(KDUpdater::UpdateOperationFactory::instance().create(opPair.first)); - Q_ASSERT_X(!op.isNull(), __FUNCTION__, QString::fromLatin1("Invalid operation name: %1.") - .arg(opPair.first).toLatin1()); + if (op.isNull()) { + qWarning() << QString::fromLatin1("Failed to load unknown operation %1").arg(opPair.first); + continue; + } if (!op->fromXml(opPair.second)) { qWarning() << "Failed to load XML for operation:" << opPair.first; -- cgit v1.2.3