more work on key import

This commit is contained in:
2020-08-12 11:12:01 +02:00
parent 377e5c865a
commit fba4f8ef21

View File

@@ -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: