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

be more verbose if gpg key import fails

Browse Source
This commit is contained in:
Giovanni Harting
2021-05-25 19:17:55 +02:00
parent 1257e6e49b
commit 1b5c0912b8
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
master.py
View File

@@ -177,7 +177,7 @@ def setup_makepkg(repo) -> None:
conf.write(c_all) conf.write(c_all)
def import_keys(pkgbuild) -> None: def import_keys(pkgbuild) -> bool:
with open(pkgbuild, errors='ignore') as pkgb: with open(pkgbuild, errors='ignore') as pkgb:
keys_s = regex_validkeys.findall(pkgb.read()) keys_s = regex_validkeys.findall(pkgb.read())
@@ -192,11 +192,16 @@ def import_keys(pkgbuild) -> None:
k = k.replace("'", "") k = k.replace("'", "")
k = k.replace("\"", "") k = k.replace("\"", "")
if len(k) == 40: if len(k) == 40:
logging.debug("[GPG] %s", s = subprocess.run(["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k],
subprocess.run( stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k], logging.debug("[GPG] %s", s.stdout.decode(errors='ignore'))
stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode(errors='ignore')) if s.returncode:
logging.info("[GPG] Imported key %s", k) logging.warning("[GPG] Import of key %s failed: %s", k, s.stdout.decode(errors="ignore"))
return False
else:
logging.info("[GPG] Imported key %s", k)
return True
def package_exists(name, repo) -> bool: def package_exists(name, repo) -> bool: