diff --git a/master.py b/master.py index a7cb4f5..c039ceb 100644 --- a/master.py +++ b/master.py @@ -9,8 +9,8 @@ import subprocess import sys import time from queue import Queue, Empty +from packaging import version -import semver import yaml regex_pkgver = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE) @@ -194,13 +194,13 @@ def parse_pkgbuild(pkgbuild_file): if not pkgver or not pkgrel: logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4]) - return semver.VersionInfo.parse("{}.{}".format(pkgver, pkgrel)) + return version.parse("{}-{}".format(pkgver, pkgrel)) def parse_repo(name, repo): ver_split = find_all_files_for_pkg(name, repo)[0].split("-") - return semver.VersionInfo.parse(ver_split[-3] + "." + ver_split[-2]) + return version.parse(ver_split[-3] + "-" + ver_split[-2]) def sync_marchs_with_config():