fixed pkgbuild parsing
This commit is contained in:
10
master.py
10
master.py
@@ -1,3 +1,5 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
import fcntl
|
import fcntl
|
||||||
import glob
|
import glob
|
||||||
import logging.config
|
import logging.config
|
||||||
@@ -13,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"^pkgrel\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)
|
||||||
@@ -186,11 +188,11 @@ def update_git2svn():
|
|||||||
|
|
||||||
|
|
||||||
def parse_pkgbuild(pkgbuild_file):
|
def parse_pkgbuild(pkgbuild_file):
|
||||||
with open(pkgbuild_file) as p:
|
with open(pkgbuild_file, errors='ignore') as p:
|
||||||
pkgbuild_str = p.read()
|
pkgbuild_str = p.read()
|
||||||
|
|
||||||
pkgver = regex_pkgver.findall(pkgbuild_str)
|
pkgver = regex_pkgver.findall(pkgbuild_str)[0]
|
||||||
pkgrel = regex_pkgrel.findall(pkgbuild_str)
|
pkgrel = regex_pkgrel.findall(pkgbuild_str)[0]
|
||||||
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])
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user