aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-04-01 15:25:41 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-04-01 15:25:41 -0400
commitfb2127c41bfc75cfcc1274c0f164ad17e4e68bcc (patch)
treeaa517edcedffa890b276e38a7def522b928ffb53
parentd1cd4e85906155b4a99c362c370e23e530ce461a (diff)
downloadkorg-helpers-fb2127c41bfc75cfcc1274c0f164ad17e4e68bcc.tar.gz
Show which keyring we are using
Indicate which keyring we are using when verifying signatures. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rwxr-xr-xsig-prover.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sig-prover.py b/sig-prover.py
index ab5469c..412d9fd 100755
--- a/sig-prover.py
+++ b/sig-prover.py
@@ -129,7 +129,7 @@ def get_random_target(config, rsect):
resp.raise_for_status()
keyring = os.path.join(config[rsect].get('keyringdir'), config[rsect].get('dirsigner_keyring'))
- logger.info(' verifying')
+ logger.info(' verifying with %s', keyring)
gpgargs = ['--verify', '--status-fd=2', '-']
ecode, out, err = gpg_run_command(gpgargs, keyring, stdin=resp.content)
if ecode == 0:
@@ -316,16 +316,16 @@ def verify_tarball(config, turl):
cfh.write(chunk)
resp.close()
if zext:
- logger.info(' uncompressing')
+ logger.info(' uncompressing %s', zext)
cmdargs = [zbin, contentfile]
ecode, out, err = _run_command(cmdargs)
if ecode > 0:
logger.critical('Error uncompressing %s', turl)
sys.exit(1)
contentfile = os.path.join(td, 'content')
- logger.info(' verifying')
gpgargs = ['--verify', '--status-fd=2', signfile, contentfile]
keyring = os.path.join(config.get('keyringdir'), config.get('keyring'))
+ logger.info(' verifying with %s', keyring)
ecode, out, err = gpg_run_command(gpgargs, keyring=keyring)
if ecode == 0:
good, valid, created, errors = validate_gpg_signature(err.decode())