diff --git a/master.py b/master.py index 049b465..522bd41 100644 --- a/master.py +++ b/master.py @@ -13,10 +13,10 @@ from queue import Queue, Empty import semver 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_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) fp = None q = Queue() update_last = time.time() @@ -114,25 +114,21 @@ def setup_makepkg(repo): def import_keys(pkgbuild): - 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: keys = [] for k in keys_s: - keys.append(k.split(" ")) - - logging.debug("Found keys: %s", keys) + 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], - check=True, capture_output=True)) - logging.debug("Imported key %s", nk) + ["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", nk], capture_output=True)) + logging.info("[GPG] Imported key %s", nk) def package_exists(name, repo):