From 8aeb4d4dd83cfbba212e678705fcf678e7ca90e2 Mon Sep 17 00:00:00 2001
From: Tim Lauridsen <timlau@fedoraproject.org>
Date: Wed, 18 Nov 2015 11:51:37 +0100
Subject: [PATCH] fix problems with gpgkey import
(fixes timlau/yumex-dnf#71)
---
python/dnfdaemon/server/__init__.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/python/dnfdaemon/server/__init__.py b/python/dnfdaemon/server/__init__.py
index c2d32f4..395c539 100644
--- a/python/dnfdaemon/server/__init__.py
+++ b/python/dnfdaemon/server/__init__.py
@@ -580,6 +580,7 @@ class DnfDaemonBase(dbus.service.Object, DownloadCallback):
msgs = [str(e)]
#print("DEBUG:", msgs)
except GPGError as e: # GPG errors
+ rc = 1
msgs = [str(e)]
#print("DEBUG:", msgs)
except Error as e: # Other transaction errors
@@ -716,8 +717,11 @@ class DnfDaemonBase(dbus.service.Object, DownloadCallback):
continue
elif result == 1:
# FIXME: Base.getKeyForPackage not public dnf api
- self.base.getKeyForPackage(po,
+ try:
+ self.base.getKeyForPackage(po,
fullaskcb=self._handle_gpg_import)
+ except dnf.exceptions.Error as e:
+ raise GPGError(str(e))
else:
raise GPGError(errmsg)
return 0
--
GitLab