Generate unique metadata name for unified metadata

If the metadata name is the same although the package is updated, it
might cause problems when pushing the data to distribution systems that
requires a filename change in order to replicate content. If the
filename stays the same it may not be refreshed to the cache.

Task-number: QTIFW-1838
Change-Id: I2fc8c1cdf559dab89b57a74ebbe758cdc71da29c
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

1 files changed, 11 insertions, 2 deletions

diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 4e3edaa05..c500e2ec8 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -627,8 +627,17 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
             }
         } else {
             const QString repoUrl = metadata.repository.url().toString();
-            addFileTaskItem(QString::fromLatin1("%1/meta.7z").arg(repoUrl),
-                metadata.directory + QString::fromLatin1("/meta.7z"), metadata, sha1.toElement().text(), QString());
+            QDomElement metadataNameElement = root.firstChildElement(QLatin1String("MetadataName"));
+            if (!metadataNameElement.isNull()) {
+                const QString metadataName = metadataNameElement.toElement().text();
+                addFileTaskItem(QString::fromLatin1("%1/%2").arg(repoUrl, metadataName),
+                    metadata.directory + QString::fromLatin1("/%1").arg(metadataName),
+                    metadata, sha1.toElement().text(), QString());
+            } else {
+                qCWarning(QInstaller::lcInstallerInstallLog) <<
+                    "Unable to find MetadataName element from Updates.xml";
+                return XmlDownloadFailure;
+            }
         }
 
         if (metadata.repository.categoryname().isEmpty()) {