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

Correct the list of leapp and leapp-repository rpms, that should be preserved during the 9to10 upgrade

Browse Source
This commit is contained in:
Yuriy Kohut 2025-03-04 16:34:27 +02:00
parent 3782e8de2b
commit 4db91e9db6
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
SOURCES/leapp-repository-0.22.0-elevate.patch
View File

@ -5134,6 +5134,40 @@ index 2ed5eacd..219d31d1 100644
+ distro_config_json["keys"].extend(siglist.sigs) + distro_config_json["keys"].extend(siglist.sigs)
+ +
+ return distro_config_json + return distro_config_json
diff --git a/repos/system_upgrade/common/libraries/dnfconfig.py b/repos/system_upgrade/common/libraries/dnfconfig.py
index 5b8180f0..4b5afeb5 100644
--- a/repos/system_upgrade/common/libraries/dnfconfig.py
+++ b/repos/system_upgrade/common/libraries/dnfconfig.py
@@ -1,28 +1,8 @@
from leapp.exceptions import StopActorExecutionError
-from leapp.libraries.common.config.version import get_source_major_version
+from leapp.libraries.common.rpms import get_leapp_packages
from leapp.libraries.stdlib import api, CalledProcessError
-def get_leapp_packages():
- """
- Return the list of leapp and leapp-repository rpms that should be preserved
- during the upgrade.
-
- It's list of packages that should be preserved, not what is really
- installed.
-
- The snactor RPM doesn't have to be installed, but if so, we have to take
- care about that too as well to prevent broken dnf transaction.
- """
- # TODO: should we set the seatbelt and exclude leapp RPMs from the target
- # system too?
- generic = ['leapp', 'snactor']
- if get_source_major_version() == '7':
- return generic + ['python2-leapp', 'leapp-upgrade-el7toel8']
-
- return generic + ['python3-leapp', 'leapp-upgrade-el8toel9']
-
-
def _strip_split(data, sep, maxsplit=-1):
"""
Just like str.split(), but remove ambient whitespaces from all items
diff --git a/repos/system_upgrade/common/libraries/dnfplugin.py b/repos/system_upgrade/common/libraries/dnfplugin.py diff --git a/repos/system_upgrade/common/libraries/dnfplugin.py b/repos/system_upgrade/common/libraries/dnfplugin.py
index 4f0c3a99..0f31f101 100644 index 4f0c3a99..0f31f101 100644
--- a/repos/system_upgrade/common/libraries/dnfplugin.py --- a/repos/system_upgrade/common/libraries/dnfplugin.py