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

replaced pgp regex with a more generic one, filter in code

Browse Source
This commit is contained in:
Giovanni Harting
2020-08-12 12:39:01 +02:00
parent d4dc25a826
commit bb344c2682
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
master.py
View File

@@ -16,7 +16,7 @@ import yaml
regex_pkgver = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE) regex_pkgver = re.compile(r"^pkgrel\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) regex_validkeys = re.compile(r"^validpgpkeys\+?=\((.*?)\)", re.MULTILINE | re.DOTALL)
fp = None fp = None
q = Queue() q = Queue()
update_last = time.time() update_last = time.time()
@@ -124,11 +124,13 @@ def import_keys(pkgbuild):
keys.extend(k.split(" ")) keys.extend(k.split(" "))
for k in keys: for k in keys:
nk = k.replace("'", "") k = k.strip()
nk = nk.replace("\"", "") k = k.replace("'", "")
k = k.replace("\"", "")
if len(k) == 40:
logging.debug(subprocess.run( logging.debug(subprocess.run(
["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", nk], capture_output=True)) ["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k], capture_output=True))
logging.info("[GPG] Imported key %s", nk) logging.info("[GPG] Imported key %s", k)
def package_exists(name, repo): def package_exists(name, repo):