From 5c36751992ff7e8ab2b5dd9bf3f1f2396c0df0fc Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Fri, 13 Feb 2026 16:56:01 +0200 Subject: [PATCH] setuptargetrepos: Setup repomap handler - combine all RepositoriesMapping messages (main + vendor) (cherry picked from commit 234dd962bbb349d56a338eba193fbdbde647d0ee) --- .../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 dfa565c10e..7c3ea442b6 100644 --- a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py +++ b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos.py @@ -139,13 +139,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 - 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)