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

fixed?! version parsing

Browse Source
This commit is contained in:
Giovanni Harting
2021-05-21 22:11:31 +02:00
parent cc0165422e
commit d0807bf22b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
master.py
View File

@@ -17,6 +17,7 @@ from queue import Empty
import yaml import yaml
from humanfriendly import format_timespan from humanfriendly import format_timespan
from packaging import version from packaging import version
from packaging.version import LegacyVersion
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_pkgrel = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE)
@@ -233,7 +234,7 @@ def parse_pkgbuild(pkgbuild_file):
logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4]) logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4])
return version.parse("") return version.parse("")
return version.parse("{}-{}".format(pkgver[0], pkgrel[0])) return LegacyVersion("{}-{}".format(pkgver[0], pkgrel[0]))
def increase_pkgrel(pkgbuild_file): def increase_pkgrel(pkgbuild_file):
@@ -249,7 +250,7 @@ def increase_pkgrel(pkgbuild_file):
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 version.parse(ver_split[-3] + "-" + ver_split[-2]) return LegacyVersion(ver_split[-3] + "-" + ver_split[-2])
def sync_marchs_with_config(): def sync_marchs_with_config():