From 8d607e364ced555d3c9decbe89dc615c24be2278 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sat, 15 Aug 2020 21:22:39 +0200 Subject: [PATCH] fixed pkgbuild parsing --- master.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/master.py b/master.py index e71174c..da3c7ce 100644 --- a/master.py +++ b/master.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + import fcntl import glob import logging.config @@ -13,7 +15,7 @@ from queue import Queue, Empty import yaml 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_march = re.compile(r"(-march=)(.+?) ", re.MULTILINE) regex_validkeys = re.compile(r"^validpgpkeys\+?=\((.*?)\)", re.MULTILINE | re.DOTALL) @@ -186,11 +188,11 @@ def update_git2svn(): def parse_pkgbuild(pkgbuild_file): - with open(pkgbuild_file) as p: + with open(pkgbuild_file, errors='ignore') as p: pkgbuild_str = p.read() - pkgver = regex_pkgver.findall(pkgbuild_str) - pkgrel = regex_pkgrel.findall(pkgbuild_str) + pkgver = regex_pkgver.findall(pkgbuild_str)[0] + pkgrel = regex_pkgrel.findall(pkgbuild_str)[0] if not pkgver or not pkgrel: logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4])