From 10c11139d32e4c7693eac97f9ee13629fe6d82f2 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 13 Aug 2020 19:40:36 +0200 Subject: [PATCH] fixed semver --- master.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/master.py b/master.py index 30607bf..a7cb4f5 100644 --- a/master.py +++ b/master.py @@ -35,14 +35,14 @@ def already_running(): def find_all_files_for_pkg(name, repo): searchpath = os.path.join(config["basedir"]["repo"], repo, "os", config["arch"]) + "/" + name + "-*.pkg.*" - logging.debug("[REPO] Search for package %s (path=%s)", name, searchpath) + # logging.debug("[REPO] Search for package %s (path=%s)", name, searchpath) pkgs = glob.glob(searchpath) for p in pkgs: if p.endswith(".sig"): pkgs.remove(p) - logging.debug("[REPO] Found %s", pkgs) + # logging.debug("[REPO] Found %s", pkgs) return pkgs @@ -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 semver.VersionInfo.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 semver.VersionInfo.parse(ver_split[-3] + "." + ver_split[-2]) def sync_marchs_with_config():