diff --git a/master.py b/master.py index 49527bc..028e54c 100644 --- a/master.py +++ b/master.py @@ -65,8 +65,8 @@ def build(pkgbuild, repo): if not os.path.exists(os.path.join(config["basedir"]["repo"], "logs", repo)): os.mkdir(os.path.join(config["basedir"]["repo"], "logs", repo)) - with open(os.path.join(config["basedir"]["repo"], "logs", repo, name + ".log"), "w") as l: - l.write(res.stdout.decode()) + with open(os.path.join(config["basedir"]["repo"], "logs", repo, name + ".log"), "w") as log: + log.write(res.stdout.decode()) subprocess.run(["git", "clean", "-xdf"], check=True, capture_output=True) os.chdir(sys.path[0]) @@ -165,8 +165,11 @@ def update_git2svn(): def parse_pkgbuild(pkgbuild_file): with open(pkgbuild_file) as p: pkgbuild_str = p.read() - pkgver = regex_pkgver.findall(pkgbuild_str) - pkgrel = regex_pkgrel.findall(pkgbuild_str) + + pkgver = regex_pkgver.findall(pkgbuild_str) + pkgrel = regex_pkgrel.findall(pkgbuild_str) + if not pkgver or not pkgrel: + logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4]) return semver.VersionInfo.parse("{}-{}".format(pkgver, pkgrel))