summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2019-08-23 11:45:49 +0200
committerWerner Koch <wk@gnupg.org>2019-08-23 11:45:49 +0200
commitf14ddeb89c4519cd7ccf52c4595b93ab11ccbda1 (patch)
tree72ebe7c7be8ef4e2cf5d8ee2e7c6394ff358ac32 /g10
parentgpgconf: Suggest the use of --gpgconf-test on --launch problems. (diff)
downloadgnupg2-f14ddeb89c4519cd7ccf52c4595b93ab11ccbda1.tar.xz
gnupg2-f14ddeb89c4519cd7ccf52c4595b93ab11ccbda1.zip
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 <wk@gnupg.org>
Diffstat (limited to 'g10')
-rw-r--r--g10/gpg.c5
-rw-r--r--g10/trustdb.c4
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));
}
}