diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-03-25 14:45:30 +0200 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-03-31 13:52:00 +0200 |
| commit | dcc773f8603d65cddd36ae725022326a1065ac9a (patch) | |
| tree | fa979f2c94d9c0cba6e68232d33f7c3c85b9be21 /tools | |
| parent | aeea613f41f3e7dd64335e734e921f4992067dd6 (diff) | |
Repogen: allow usage of --update-new-components with unified metadata
I couldn't find a reason why this combination wouldn't work. If there
are no known issues the option should be allowed.
Task-number: QTIFW-2558
Change-Id: I9bceddc70e3ea4edeb1af2fe873f96bf815900d3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/repogen/repogen.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp index 13c763866..a8720a0de 100644 --- a/tools/repogen/repogen.cpp +++ b/tools/repogen/repogen.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -160,7 +160,6 @@ int main(int argc, char** argv) } else if (args.first() == QLatin1String("--update-new-components")) { args.removeFirst(); updateExistingRepositoryWithNewComponents = true; - createUnifiedMetadata = false; } else if (args.first() == QLatin1String("-p") || args.first() == QLatin1String("--packages")) { args.removeFirst(); if (args.isEmpty()) { @@ -253,17 +252,6 @@ int main(int argc, char** argv) if (remove) QInstaller::removeDirectory(repoInfo.repositoryDir); - if (updateExistingRepositoryWithNewComponents) { - QStringList meta7z = QDir(repoInfo.repositoryDir).entryList(QStringList() - << QLatin1String("*_meta.7z"), QDir::Files); - if (!meta7z.isEmpty()) { - throw QInstaller::Error(QCoreApplication::translate("QInstaller", - "Cannot update \"%1\" with --update-new-components. Use --update instead. " - "Currently it is not possible to update partial components inside one 7z.") - .arg(meta7z.join(QLatin1Char(',')))); - } - } - if (!update && QFile::exists(repoInfo.repositoryDir) && !QDir(repoInfo.repositoryDir).entryList( QDir::AllEntries | QDir::NoDotAndDotDot).isEmpty()) { |