From bb344c2682dcb876bccc01f0eb230572da5952a9 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Wed, 12 Aug 2020 12:39:01 +0200
Subject: [PATCH] replaced pgp regex with a more generic one, filter in code

---
 master.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/master.py b/master.py
index 801db20..31346f3 100644
--- a/master.py
+++ b/master.py
@@ -16,7 +16,7 @@ import yaml
 regex_pkgver = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE)
 regex_pkgrel = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE)
 regex_march = re.compile(r"(-march=)(.+?) ", re.MULTILINE)
-regex_validkeys = re.compile(r"^validpgpkeys\+*=\((.*?)\).*$", re.MULTILINE)
+regex_validkeys = re.compile(r"^validpgpkeys\+?=\((.*?)\)", re.MULTILINE | re.DOTALL)
 fp = None
 q = Queue()
 update_last = time.time()
@@ -124,11 +124,13 @@ def import_keys(pkgbuild):
             keys.extend(k.split(" "))
 
         for k in keys:
-            nk = k.replace("'", "")
-            nk = nk.replace("\"", "")
-            logging.debug(subprocess.run(
-                ["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", nk], capture_output=True))
-            logging.info("[GPG] Imported key %s", nk)
+            k = k.strip()
+            k = k.replace("'", "")
+            k = k.replace("\"", "")
+            if len(k) == 40:
+                logging.debug(subprocess.run(
+                    ["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k], capture_output=True))
+                logging.info("[GPG] Imported key %s", k)
 
 
 def package_exists(name, repo):