From fba4f8ef21fe3779ae99395c8d20bfb0556ab09c Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Wed, 12 Aug 2020 11:12:01 +0200
Subject: [PATCH] more work on key import

---
 master.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/master.py b/master.py
index 96b1d00..049b465 100644
--- a/master.py
+++ b/master.py
@@ -16,7 +16,7 @@ import yaml
 regex_pkgver = re.compile(r"^pkgrel\s*=\s*(.+)$")
 regex_pkgrel = re.compile(r"^pkgrel\s*=\s*(.+)$")
 regex_march = re.compile(r"(-march=)(.+?) ")
-regex_validkeys = re.compile(r"^validpgpkeys=\((.*)\).*$")
+regex_validkeys = re.compile(r"^validpgpkeys\+*=\((.*)\).*$")
 fp = None
 q = Queue()
 update_last = time.time()
@@ -114,8 +114,9 @@ def setup_makepkg(repo):
 
 
 def import_keys(pkgbuild):
-    with open(pkgbuild) as p:
-        keys_s = regex_validkeys.findall(p.read())
+    logging.debug("Search for keys in: %s", pkgbuild)
+    with open(pkgbuild) as pkgb:
+        keys_s = regex_validkeys.findall(pkgb.read())
         logging.debug("Found raw keys: %s", keys_s)
 
     if keys_s: