From f14ddeb89c4519cd7ccf52c4595b93ab11ccbda1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 23 Aug 2019 11:45:49 +0200 Subject: gpg: Do not show two informational diagnostics with quiet. * g10/trustdb.c (verify_own_keys): Silence informational diagnostic. -- This silences these notes with --quiet gpg: Note: RFC4880bis features are enabled. gpg: key EE65E8C75D41FD1D marked as ultimately trusted GnuPG-bug-id: 4634 Signed-off-by: Werner Koch --- g10/gpg.c | 5 ++++- g10/trustdb.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/g10/gpg.c b/g10/gpg.c index 8d3898d4e..0b7788971 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -3752,7 +3752,10 @@ main (int argc, char **argv) log_info(_("WARNING: program may create a core file!\n")); if (opt.flags.rfc4880bis) - log_info ("Note: RFC4880bis features are enabled.\n"); + { + if (!opt.quiet) + log_info ("Note: RFC4880bis features are enabled.\n"); + } else { opt.mimemode = 0; /* This will use text mode instead. */ diff --git a/g10/trustdb.c b/g10/trustdb.c index a230a6c03..bd1dad8f5 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -303,7 +303,9 @@ verify_own_keys (ctrl_t ctrl) release_public_key_parts (&pk); } - log_info (_("key %s marked as ultimately trusted\n"),keystr(k->kid)); + if (!opt.quiet) + log_info (_("key %s marked as ultimately trusted\n"), + keystr(k->kid)); } } -- cgit v1.2.3