forked from rpms/leapp-repository
Add AlmaLinux 8 new GPG key
This commit is contained in:
parent
c23271bffe
commit
6bc680c702
@ -5057,10 +5057,10 @@ index f4b02e9f..c22165e5 100644
|
|||||||
def test_pes_data_not_found(monkeypatch):
|
def test_pes_data_not_found(monkeypatch):
|
||||||
def read_or_fetch_mocked(filename, directory="/etc/leapp/files", service=None, allow_empty=False):
|
def read_or_fetch_mocked(filename, directory="/etc/leapp/files", service=None, allow_empty=False):
|
||||||
diff --git a/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py b/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py
|
diff --git a/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py b/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py
|
||||||
index 01f6df38..84649709 100644
|
index 01f6df38..5c128f83 100644
|
||||||
--- a/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py
|
--- a/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py
|
||||||
+++ b/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py
|
+++ b/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py
|
||||||
@@ -1,27 +1,69 @@
|
@@ -1,27 +1,70 @@
|
||||||
from leapp.actors import Actor
|
from leapp.actors import Actor
|
||||||
from leapp.libraries.common import rhui
|
from leapp.libraries.common import rhui
|
||||||
-from leapp.models import InstalledRedHatSignedRPM, InstalledRPM, InstalledUnsignedRPM
|
-from leapp.models import InstalledRedHatSignedRPM, InstalledRPM, InstalledUnsignedRPM
|
||||||
@ -5082,7 +5082,8 @@ index 01f6df38..84649709 100644
|
|||||||
+ '6c7cb6ef305d49d6'],
|
+ '6c7cb6ef305d49d6'],
|
||||||
+ 'cloudlinux': ['8c55a6628608cb71'],
|
+ 'cloudlinux': ['8c55a6628608cb71'],
|
||||||
+ 'almalinux': ['51d6647ec21ad6ea',
|
+ 'almalinux': ['51d6647ec21ad6ea',
|
||||||
+ 'd36cb86cb86b3716'],
|
+ 'd36cb86cb86b3716',
|
||||||
|
+ '2ae81e8aced7258b'],
|
||||||
+ 'rocky': ['15af5dac6d745a60',
|
+ 'rocky': ['15af5dac6d745a60',
|
||||||
+ '702d426d350d275d'],
|
+ '702d426d350d275d'],
|
||||||
+ 'ol': ['72f97b74ec551f03',
|
+ 'ol': ['72f97b74ec551f03',
|
||||||
@ -5140,7 +5141,7 @@ index 01f6df38..84649709 100644
|
|||||||
|
|
||||||
signed_pkgs = InstalledRedHatSignedRPM()
|
signed_pkgs = InstalledRedHatSignedRPM()
|
||||||
unsigned_pkgs = InstalledUnsignedRPM()
|
unsigned_pkgs = InstalledUnsignedRPM()
|
||||||
@@ -32,11 +74,11 @@ class RedHatSignedRpmScanner(Actor):
|
@@ -32,11 +75,11 @@ class RedHatSignedRpmScanner(Actor):
|
||||||
all_signed = [
|
all_signed = [
|
||||||
env
|
env
|
||||||
for env in env_vars
|
for env in env_vars
|
||||||
@ -5155,7 +5156,7 @@ index 01f6df38..84649709 100644
|
|||||||
|
|
||||||
def is_gpg_pubkey(pkg):
|
def is_gpg_pubkey(pkg):
|
||||||
"""Check if gpg-pubkey pkg exists or LEAPP_DEVEL_RPMS_ALL_SIGNED=1
|
"""Check if gpg-pubkey pkg exists or LEAPP_DEVEL_RPMS_ALL_SIGNED=1
|
||||||
@@ -44,15 +86,30 @@ class RedHatSignedRpmScanner(Actor):
|
@@ -44,15 +87,30 @@ class RedHatSignedRpmScanner(Actor):
|
||||||
gpg-pubkey is not signed as it would require another package
|
gpg-pubkey is not signed as it would require another package
|
||||||
to verify its signature
|
to verify its signature
|
||||||
"""
|
"""
|
||||||
@ -5191,7 +5192,7 @@ index 01f6df38..84649709 100644
|
|||||||
|
|
||||||
def is_azure_pkg(pkg):
|
def is_azure_pkg(pkg):
|
||||||
"""Whitelist Azure config package."""
|
"""Whitelist Azure config package."""
|
||||||
@@ -68,16 +125,25 @@ class RedHatSignedRpmScanner(Actor):
|
@@ -68,16 +126,25 @@ class RedHatSignedRpmScanner(Actor):
|
||||||
for pkg in rpm_pkgs.items:
|
for pkg in rpm_pkgs.items:
|
||||||
if any(
|
if any(
|
||||||
[
|
[
|
||||||
|
@ -43,7 +43,7 @@ py2_byte_compile "%1" "%2"}
|
|||||||
Epoch: 1
|
Epoch: 1
|
||||||
Name: leapp-repository
|
Name: leapp-repository
|
||||||
Version: 0.16.0
|
Version: 0.16.0
|
||||||
Release: 6%{?dist}.elevate.18
|
Release: 6%{?dist}.elevate.19
|
||||||
Summary: Repositories for leapp
|
Summary: Repositories for leapp
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
|
Loading…
Reference in New Issue
Block a user