ykohut/leapp-repository
1
0
Fork 0
forked from rpms/leapp-repository
Code Pull Requests Activity

Update ELevate vendors patch:

Browse Source 
- fix "_get_path_to_gpg_certs is not defined" issue
This commit is contained in:
Yuriy Kohut 2024-08-23 23:27:55 +03:00
parent 07a2eaff0f
commit b7fed91696
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3903,7 +3903,7 @@ index 9e213f64..52cfe14f 100644
variant_id=data.get('VARIANT_ID', '').strip('"') or None variant_id=data.get('VARIANT_ID', '').strip('"') or None
) )
diff --git a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py b/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py diff --git a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py b/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py
index 32e4527b..48633a3e 100644 index 32e4527b..1e595e9a 100644
--- a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py --- a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py
+++ b/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py +++ b/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py
@@ -152,11 +152,11 @@ def _report(title, summary, keys, inhibitor=False): @@ -152,11 +152,11 @@ def _report(title, summary, keys, inhibitor=False):
@ -3916,7 +3916,7 @@ index 32e4527b..48633a3e 100644
' If you want to proceed the in-place upgrade without checking any RPM' ' If you want to proceed the in-place upgrade without checking any RPM'
' signatures, execute leapp with the `--nogpgcheck` option.' ' signatures, execute leapp with the `--nogpgcheck` option.'
- .format(get_path_to_gpg_certs()) - .format(get_path_to_gpg_certs())
+ .format(','.format(_get_path_to_gpg_certs())) + .format(','.format(get_path_to_gpg_certs()))
) )
groups = [reporting.Groups.REPOSITORY] groups = [reporting.Groups.REPOSITORY]
if inhibitor: if inhibitor:
@ -3925,7 +3925,7 @@ index 32e4527b..48633a3e 100644
'Some of the target repositories require GPG keys that are not installed' 'Some of the target repositories require GPG keys that are not installed'
' in the current RPM DB or are not stored in the {trust_dir} directory.' ' in the current RPM DB or are not stored in the {trust_dir} directory.'
- .format(trust_dir=get_path_to_gpg_certs()) - .format(trust_dir=get_path_to_gpg_certs())
+ .format(trust_dir=','.join(_get_path_to_gpg_certs())) + .format(trust_dir=','.join(get_path_to_gpg_certs()))
) )
_report('Detected unknown GPG keys for target system repositories', summary, keys, True) _report('Detected unknown GPG keys for target system repositories', summary, keys, True)