Remove operation xml verbose output.

Delete the operation and continue in error case without
adding the operation to the performed operations list.

Change-Id: I8e0f9bacb0d3b1e3fc1883b77e9a52d2f886d1b5
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/common/binaryformat.cpp
index 02b540115..4fc8307b4 100644
--- a/installerbuilder/common/binaryformat.cpp
+++ b/installerbuilder/common/binaryformat.cpp
@@ -963,15 +963,15 @@ void BinaryContent::readBinaryData(BinaryContent &content, const QSharedPointer<
 
     for (int i = 0; i < operationsCount; ++i) {
         const QString name = retrieveString(file.data());
-        Operation *op = KDUpdater::UpdateOperationFactory::instance().create(name);
-        Q_ASSERT_X(op, __FUNCTION__, QString::fromLatin1("Invalid operation name: %1").arg(name)
+        QScopedPointer<Operation> op(KDUpdater::UpdateOperationFactory::instance().create(name));
+        Q_ASSERT_X(!op.isNull(), __FUNCTION__, QString::fromLatin1("Invalid operation name: %1").arg(name)
             .toLatin1());
 
-        const QString xml = retrieveString(file.data());
-        if (!op->fromXml(xml))
+        if (!op->fromXml(retrieveString(file.data()))) {
             qWarning() << "Failed to load XML for operation:" << name;
-        verbose() << "Operation name: " << name << "\nOperation xml:\n" << xml.leftRef(1000) << std::endl;
-        content.m_performedOperations.push(op);
+            continue;
+        }
+        content.m_performedOperations.push(op.take());
     }
 
     // seek to the position of the component index