be more verbose if gpg key import fails
This commit is contained in:
17
master.py
17
master.py
@@ -177,7 +177,7 @@ def setup_makepkg(repo) -> None:
|
||||
conf.write(c_all)
|
||||
|
||||
|
||||
def import_keys(pkgbuild) -> None:
|
||||
def import_keys(pkgbuild) -> bool:
|
||||
with open(pkgbuild, errors='ignore') as pkgb:
|
||||
keys_s = regex_validkeys.findall(pkgb.read())
|
||||
|
||||
@@ -192,11 +192,16 @@ def import_keys(pkgbuild) -> None:
|
||||
k = k.replace("'", "")
|
||||
k = k.replace("\"", "")
|
||||
if len(k) == 40:
|
||||
logging.debug("[GPG] %s",
|
||||
subprocess.run(
|
||||
["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k],
|
||||
stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode(errors='ignore'))
|
||||
logging.info("[GPG] Imported key %s", k)
|
||||
s = subprocess.run(["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k],
|
||||
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
logging.debug("[GPG] %s", s.stdout.decode(errors='ignore'))
|
||||
if s.returncode:
|
||||
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:
|
||||
|
Reference in New Issue
Block a user