From 1b5c0912b892e2b076ea0bc4fdcccd4687409e5f Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Tue, 25 May 2021 19:17:55 +0200
Subject: [PATCH] be more verbose if gpg key import fails

---
 master.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/master.py b/master.py
index 878a0e2..f64da23 100644
--- a/master.py
+++ b/master.py
@@ -177,7 +177,7 @@ def setup_makepkg(repo) -> None:
             conf.write(c_all)
 
 
-def import_keys(pkgbuild) -> None:
+def import_keys(pkgbuild) -> bool:
     with open(pkgbuild, errors='ignore') as pkgb:
         keys_s = regex_validkeys.findall(pkgb.read())
 
@@ -192,11 +192,16 @@ def import_keys(pkgbuild) -> None:
             k = k.replace("'", "")
             k = k.replace("\"", "")
             if len(k) == 40:
-                logging.debug("[GPG] %s",
-                              subprocess.run(
-                                  ["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k],
-                                  stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode(errors='ignore'))
-                logging.info("[GPG] Imported key %s", k)
+                s = subprocess.run(["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k],
+                                   stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                logging.debug("[GPG] %s", s.stdout.decode(errors='ignore'))
+                if s.returncode:
+                    logging.warning("[GPG] Import of key %s failed: %s", k, s.stdout.decode(errors="ignore"))
+                    return False
+                else:
+                    logging.info("[GPG] Imported key %s", k)
+
+    return True
 
 
 def package_exists(name, repo) -> bool: