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

fixed gpg import

Browse Source
This commit is contained in:
Giovanni Harting
2020-08-12 11:28:19 +02:00
parent fba4f8ef21
commit 7a4a2b991b
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
master.py
View File

@@ -13,10 +13,10 @@ from queue import Queue, Empty
import semver import semver
import yaml import yaml
regex_pkgver = re.compile(r"^pkgrel\s*=\s*(.+)$") regex_pkgver = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE)
regex_pkgrel = re.compile(r"^pkgrel\s*=\s*(.+)$") regex_pkgrel = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE)
regex_march = re.compile(r"(-march=)(.+?) ") regex_march = re.compile(r"(-march=)(.+?) ", re.MULTILINE)
regex_validkeys = re.compile(r"^validpgpkeys\+*=\((.*)\).*$") regex_validkeys = re.compile(r"^validpgpkeys\+*=\((.*?)\).*$", re.MULTILINE)
fp = None fp = None
q = Queue() q = Queue()
update_last = time.time() update_last = time.time()
@@ -114,25 +114,21 @@ def setup_makepkg(repo):
def import_keys(pkgbuild): def import_keys(pkgbuild):
logging.debug("Search for keys in: %s", pkgbuild)
with open(pkgbuild) as pkgb: with open(pkgbuild) as pkgb:
keys_s = regex_validkeys.findall(pkgb.read()) keys_s = regex_validkeys.findall(pkgb.read())
logging.debug("Found raw keys: %s", keys_s)
if keys_s: if keys_s:
keys = [] keys = []
for k in keys_s: for k in keys_s:
keys.append(k.split(" ")) keys.extend(k.split(" "))
logging.debug("Found keys: %s", keys)
for k in keys: for k in keys:
nk = k.replace("'", "") nk = k.replace("'", "")
nk = nk.replace("\"", "")
logging.debug(subprocess.run( logging.debug(subprocess.run(
["gpg", "--keyserver keyserver.ubuntu.com", "--recv-keys", nk], ["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", nk], capture_output=True))
check=True, capture_output=True)) logging.info("[GPG] Imported key %s", nk)
logging.debug("Imported key %s", nk)
def package_exists(name, repo): def package_exists(name, repo):