diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-11 15:22:02 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-11 15:22:36 +0200 |
commit | 8ae8ef94ce71a5492fd83e2833f3074beef684da (patch) | |
tree | 0858bb11cf9f92eb669230ee1d87e24e0522a2ee /src | |
parent | 9c324a7d9e13ddf430381b1a2aa329189748d3c5 (diff) | |
parent | 27161960daec42cb81bdf2c4629ed59cfeafca9e (diff) |
Merge remote-tracking branch 'origin/1.3'
Change-Id: Iabd77388834a27ace28587ded37c66b4c9a9cbd3
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/binaryformat.cpp | 6 | ||||
-rw-r--r-- | src/libs/installer/settings.cpp | 2 |
2 files changed, 5 insertions, 3 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<QString, QString> opPair = d->m_performedOperationsData.at(i); QScopedPointer<Operation> 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; diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 454edd481..2635dc10c 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -90,7 +90,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)); } |