lorax: update package verification for dnf API

QubesOS/qubes-issues#1807
This commit is contained in:
Marek Marczykowski-Górecki 2016-05-25 11:25:54 +02:00
parent 7484fb2bb5
commit 7875d31a8f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 42 additions and 0 deletions

View File

@ -0,0 +1,40 @@
From 93d1aceb41bc2f57cbf3269d165c29438ced0fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 25 May 2016 11:24:14 +0200
Subject: [PATCH] Update package verification for dnf API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Invisible Things Lab
Cc: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
src/pylorax/ltmpl.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pylorax/ltmpl.py b/src/pylorax/ltmpl.py
index 661790d..8454566 100644
--- a/src/pylorax/ltmpl.py
+++ b/src/pylorax/ltmpl.py
@@ -581,14 +581,14 @@ class LoraxTemplateRunner(object):
try:
for po in pkgs_to_download:
# before doing anything with the package, verify its signature
- result, errmsg = self.dbo.sigCheckPkg(po)
+ result, errmsg = self.dbo._sig_check_pkg(po)
if result == 0:
# Verified ok, or verify not req'd
pass
elif result == 1:
# keys are provided through kickstart, so treat this as consent
# for importing them
- self.dbo.getKeyForPackage(po, lambda x, y, z: True)
+ self.dbo._get_key_for_package(po, lambda x, y, z: True)
else:
# Fatal error
raise dnf.exceptions.Error(errmsg)
--
2.5.5

View File

@ -21,6 +21,7 @@ Source0: %{name}-%{version}.tar.gz
Patch0: Drop-multiprocessing-for-do_transaction-1208296.patch
Patch1: 0001-Allow-specify-gpg-key-for-a-repository.patch
Patch2: 0002-verify-packages-signature.patch
Patch3: 0003-Update-package-verification-for-dnf-API.patch
BuildRequires: python3-devel
BuildRequires: python3-pocketlint >= 0.5
@ -115,6 +116,7 @@ to run Anaconda.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build