2017-01-09 03:13:42 +00:00
|
|
|
From 74415994cef3c5ea0331ac2bd3355c2c2dc62664 Mon Sep 17 00:00:00 2001
|
2016-05-25 09:25:54 +00:00
|
|
|
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
|
|
|
|
<marmarek@invisiblethingslab.com>
|
|
|
|
Date: Wed, 25 May 2016 11:24:14 +0200
|
2017-01-09 03:13:42 +00:00
|
|
|
Subject: [PATCH 3/3] Update package verification for dnf API
|
2016-05-25 09:25:54 +00:00
|
|
|
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
|
2017-01-09 03:13:42 +00:00
|
|
|
index 28b7ff9..eed01ae 100644
|
2016-05-25 09:25:54 +00:00
|
|
|
--- a/src/pylorax/ltmpl.py
|
|
|
|
+++ b/src/pylorax/ltmpl.py
|
2017-01-09 03:13:42 +00:00
|
|
|
@@ -627,14 +627,14 @@ class LoraxTemplateRunner(object):
|
2016-05-25 09:25:54 +00:00
|
|
|
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)
|
|
|
|
--
|
2017-01-09 03:13:42 +00:00
|
|
|
2.7.4
|
2016-05-25 09:25:54 +00:00
|
|
|
|