diff options
| author | Werner Koch <wk@gnupg.org> | 2024-12-05 16:32:25 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2024-12-05 16:32:25 +0100 |
| commit | 7b2748c6d8fb33e390a3bec9ae9da7679fb59aa6 (patch) | |
| tree | 706978b8f57e421b229c28a286f4f1d60d3a340e | |
| parent | Post release updates (diff) | |
| download | gnupg2-7b2748c6d8fb33e390a3bec9ae9da7679fb59aa6.tar.xz gnupg2-7b2748c6d8fb33e390a3bec9ae9da7679fb59aa6.zip | |
gpg: Silence expired trusted-key diagnostics in quiet mode.
* g10/trustdb.c (validate_keys): Take care of --quiet.
--
GnuPG-bug-id: 7351
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | g10/trustdb.c | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -2,6 +2,10 @@ Noteworthy changes in version 2.5.3 (unreleased) ------------------------------------------------ + See-also: gnupg-announce/2024q4/000xxx.html + Release-info: https://dev.gnupg.org/T7442 + + Noteworthy changes in version 2.5.2 (2024-12-05) ------------------------------------------------ diff --git a/g10/trustdb.c b/g10/trustdb.c index 7dc1c8f38..9c26a8336 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -2240,15 +2240,17 @@ validate_keys (ctrl_t ctrl, int interactive) keyblock = get_pubkeyblock (ctrl, k->kid); if (!keyblock) { - log_info (_("Note: ultimately trusted key %s not found\n"), - keystr(k->kid)); + if (!opt.quiet) + log_info (_("Note: ultimately trusted key %s not found\n"), + keystr(k->kid)); continue; } pk = keyblock->pkt->pkt.public_key; if (pk->has_expired) { - log_info (_("Note: ultimately trusted key %s expired\n"), - keystr(k->kid)); + if (!opt.quiet) + log_info (_("Note: ultimately trusted key %s expired\n"), + keystr(k->kid)); continue; } |