From 78ab761cc0afaa05f2814c5ecb2e365b832c32cb Mon Sep 17 00:00:00 2001 From: Roman Prilipskii Date: Thu, 15 Jan 2026 08:19:27 +0100 Subject: [PATCH] CLOS-3828: Combine repository mappings when setting up target repos Previously the code only considered a single repomap item - likely a leftover from upstream, where it's not expected that more than one exists. In our case it's quite likely, however, due to each vendor having their own repomap that may appear conditionally. Therefore, all available maps need to be merged before usage. --- .../actors/setuptargetrepos/libraries/setuptargetrepos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py index d5338834aa..d60292f7e4 100644 --- a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py +++ b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py @@ -134,13 +134,13 @@ def process(): "Vendor repolist: {}".format([repo.repoid for repo in vendor_repos]) ) - # Setup repomap handler - repo_mappig_msg = next(api.consume(RepositoriesMapping), RepositoriesMapping()) + # Setup repomap handler from combined repomapping message + repo_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(repo_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)