From 61aaf2b4251ceb35b38192e87e74f4da92f3fdb0 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Fri, 13 Feb 2026 17:21:12 +0200 Subject: [PATCH] Update ELevate patch: Setup repomap handler - combine all RepositoriesMapping messages (main + vendor) Bump the package release --- SOURCES/leapp-repository-0.24.0-elevate.patch | 19 +++++++++++++++---- SPECS/leapp-repository.spec | 6 +++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/SOURCES/leapp-repository-0.24.0-elevate.patch b/SOURCES/leapp-repository-0.24.0-elevate.patch index de83f54..c62c69e 100644 --- a/SOURCES/leapp-repository-0.24.0-elevate.patch +++ b/SOURCES/leapp-repository-0.24.0-elevate.patch @@ -4433,7 +4433,7 @@ index 91855818..3a7e955b 100644 tags = (IPUWorkflowTag, FactsPhaseTag) diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py -index df17a217..41e10247 100644 +index df17a217..85c88034 100644 --- a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py +++ b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py @@ -1,6 +1,7 @@ @@ -4454,7 +4454,7 @@ index df17a217..41e10247 100644 ) from leapp.utils.deprecation import suppress_deprecation -@@ -83,14 +85,63 @@ def _get_mapped_repoids(repomap, src_repoids): +@@ -83,22 +85,71 @@ def _get_mapped_repoids(repomap, src_repoids): return mapped_repoids @@ -4516,8 +4516,19 @@ index df17a217..41e10247 100644 + "Vendor repolist: {}".format([repo.repoid for repo in vendor_repos]) + ) - # Setup repomap handler - repo_mappig_msg = next(api.consume(RepositoriesMapping), RepositoriesMapping()) +- # Setup repomap handler +- repo_mappig_msg = next(api.consume(RepositoriesMapping), RepositoriesMapping()) ++ # Setup repomap handler - combine all RepositoriesMapping messages (main + vendor) ++ combined_mapping_msg = combine_repomap_messages(repo_mapping_list) + + rhui_info = next(api.consume(RHUIInfo), None) + cloud_provider = rhui_info.provider if rhui_info else '' + +- repomap = setuptargetrepos_repomap.RepoMapDataHandler(repo_mappig_msg, cloud_provider=cloud_provider) ++ repomap = setuptargetrepos_repomap.RepoMapDataHandler(combined_mapping_msg, cloud_provider=cloud_provider) + + # Filter set of repoids from installed packages so that it contains only repoids with mapping + repoids_from_installed_packages_with_mapping = _get_mapped_repoids(repomap, repoids_from_installed_packages) @@ -166,6 +217,10 @@ def process(): custom_repos = [repo for repo in custom_repos if repo.repoid not in excluded_repoids] custom_repos = sorted(custom_repos, key=lambda x: x.repoid) diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec index 37b054c..0cf3b71 100644 --- a/SPECS/leapp-repository.spec +++ b/SPECS/leapp-repository.spec @@ -53,7 +53,7 @@ py2_byte_compile "%1" "%2"} Epoch: 1 Name: leapp-repository Version: 0.24.0 -Release: 1%{?dist}.elevate.1 +Release: 1%{?dist}.elevate.2 Summary: Repositories for leapp License: ASL 2.0 @@ -350,6 +350,10 @@ fi %changelog +* Fri Feb 13 2026 Yuriy Kohut - 0.24.0-1.elevate.2 +- Update ELevate patch: + - Setup repomap handler - combine all RepositoriesMapping messages (main + vendor) + * Thu Feb 12 2026 Yuriy Kohut - 0.24.0-1.elevate.1 - ELevate vendors support for upstream 0.24.0-1 version (362613c38004dbe6feddadfaac2114b307c93484) -- 2.47.3