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

fixed pkgbuild parsing 3/?

Browse Source
This commit is contained in:
Giovanni Harting
2020-08-15 21:28:57 +02:00
parent 8d1f1e4810
commit c185eb7d85
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
master.py
View File

@@ -15,7 +15,7 @@ from queue import Queue, Empty
import yaml import yaml
from packaging import version from packaging import version
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)
regex_march = re.compile(r"(-march=)(.+?) ", re.MULTILINE) regex_march = re.compile(r"(-march=)(.+?) ", re.MULTILINE)
regex_validkeys = re.compile(r"^validpgpkeys\+?=\((.*?)\)", re.MULTILINE | re.DOTALL) regex_validkeys = re.compile(r"^validpgpkeys\+?=\((.*?)\)", re.MULTILINE | re.DOTALL)
@@ -195,7 +195,7 @@ def parse_pkgbuild(pkgbuild_file):
pkgrel = regex_pkgrel.findall(pkgbuild_str) pkgrel = regex_pkgrel.findall(pkgbuild_str)
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 None return version.parse("")
return version.parse("{}-{}".format(pkgver[0], pkgrel[0])) return version.parse("{}-{}".format(pkgver[0], pkgrel[0]))