From b06f5b541748afc30bff787858702ed575662382 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Tue, 23 Mar 2021 12:31:31 +0200 Subject: Offline-generator: Fix duplicate package entries in internal Updates.xml In a somewhat rare case, it is possible that a same package exist in multiple repositories. The latest available package from remotes is used - however if we select that package for inclusion and also implicitly get some other package from the another repository it exists in with an older version (autodependency, etc.), that repository is then also used to parse package information, and we store a duplicate entry of the package to the Updates.xml to-be-written to the offline installer binary. Fix by appending only the package with the latest version to the PackageInfoVector object used to temporarily hold the package information. Task-number: QTIFW-2190 Change-Id: Icdb3dc979153dfada37fdb0aabb3c718bc8aedff Reviewed-by: Qt CI Bot Reviewed-by: Katja Marttila --- .../test_package_versions/repository_2/A/1.0.0content.7z | Bin 0 -> 32 bytes .../repository_2/A/1.0.0content.7z.sha1 | 1 + .../test_package_versions/repository_2/A/1.0.0meta.7z | Bin 0 -> 221 bytes 3 files changed, 1 insertion(+) create mode 100644 tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0content.7z create mode 100644 tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0content.7z.sha1 create mode 100644 tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0meta.7z (limited to 'tests/auto/tools/repotest/test_package_versions/repository_2/A') diff --git a/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0content.7z b/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0content.7z new file mode 100644 index 000000000..46e2c9124 Binary files /dev/null and b/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0content.7z differ diff --git a/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0content.7z.sha1 b/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0content.7z.sha1 new file mode 100644 index 000000000..53010cea2 --- /dev/null +++ b/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0content.7z.sha1 @@ -0,0 +1 @@ +059e5ed8cd3a1fbca08cccfa4075265192603e3f \ No newline at end of file diff --git a/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0meta.7z b/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0meta.7z new file mode 100644 index 000000000..c4da482bf Binary files /dev/null and b/tests/auto/tools/repotest/test_package_versions/repository_2/A/1.0.0meta.7z differ -- cgit v1.2.3