anonfunc/alhp
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed semver

Browse Source
This commit is contained in:
Giovanni Harting
2020-08-13 19:40:36 +02:00
parent 2c472df7c9
commit 10c11139d3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
master.py
View File

@@ -35,14 +35,14 @@ def already_running():
def find_all_files_for_pkg(name, repo): def find_all_files_for_pkg(name, repo):
searchpath = os.path.join(config["basedir"]["repo"], repo, "os", config["arch"]) + "/" + name + "-*.pkg.*" 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) pkgs = glob.glob(searchpath)
for p in pkgs: for p in pkgs:
if p.endswith(".sig"): if p.endswith(".sig"):
pkgs.remove(p) pkgs.remove(p)
logging.debug("[REPO] Found %s", pkgs) # logging.debug("[REPO] Found %s", pkgs)
return pkgs return pkgs
@@ -194,13 +194,13 @@ def parse_pkgbuild(pkgbuild_file):
if not pkgver or not pkgrel: if not pkgver or not pkgrel:
logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4]) 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): def parse_repo(name, repo):
ver_split = find_all_files_for_pkg(name, repo)[0].split("-") 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(): def sync_marchs_with_config():