diff --git a/master.py b/master.py index fabc79e..9d7a72b 100644 --- a/master.py +++ b/master.py @@ -15,7 +15,7 @@ from queue import Queue, Empty import yaml from packaging import version -regex_pkgver = re.compile(r"^pkgver\s*=\s*(.+)$", re.MULTILINE) +regex_pkgver = re.compile(r"^_?pkgver\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 | re.DOTALL) @@ -195,7 +195,7 @@ def parse_pkgbuild(pkgbuild_file): pkgrel = regex_pkgrel.findall(pkgbuild_str) if not pkgver or not pkgrel: logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4]) - return None + return version.parse("") return version.parse("{}-{}".format(pkgver[0], pkgrel[0]))