aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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));
}
}