rpms/leapp-repository
7
0
Fork 1
Code Issues Pull Requests 2 Releases Activity

Update ELevate patch: Setup repomap handler - combine all RepositoriesMapping messages (main + vendor)

Browse Source 
Bump the package release
This commit is contained in:
Yuriy Kohut 2026-02-13 17:14:18 +02:00
parent 49f1bc47dc
commit d2c9cf9eee
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SOURCES/leapp-repository-0.21.0-elevate.patch
View File

@ -4481,7 +4481,7 @@ index 767fa00c..bc1d5bfa 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 a6073aa3..dfa565c1 100644
index a6073aa3..7c3ea442 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 @@
@ -4502,7 +4502,7 @@ index a6073aa3..dfa565c1 100644
)
RHUI_CLIENT_REPOIDS_RHEL88_TO_RHEL810 = {
@@ -80,13 +82,62 @@ def _get_mapped_repoids(repomap, src_repoids):
@@ -80,21 +82,70 @@ def _get_mapped_repoids(repomap, src_repoids):
return mapped_repoids
@ -4563,8 +4563,19 @@ index a6073aa3..dfa565c1 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)
@@ -168,6 +219,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)

6
SPECS/leapp-repository.spec
View File

@ -53,7 +53,7 @@ py2_byte_compile "%1" "%2"}
Epoch: 1
Name: leapp-repository
Version: 0.21.0
Release: 5%{?dist}.elevate.4
Release: 5%{?dist}.elevate.5
Summary: Repositories for leapp
License: ASL 2.0
@ -427,6 +427,10 @@ done;
# no files here
%changelog
* Fri Feb 13 2026 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-5.elevate.5
- Update ELevate patch:
- Setup repomap handler - combine all RepositoriesMapping messages (main + vendor)
* Tue May 20 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-5.elevate.4
- Allow upgrade path to 9.6