[Pkg-gnupg-commit] [gnupg2] 31/241: gpg: Improve output.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Dec 9 20:31:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit bc9ff6c85e2d89be4ee873b8a72a214759a66157
Author: Neal H. Walfield <neal at g10code.com>
Date: Tue Oct 20 14:53:29 2015 +0200
gpg: Improve output.
* g10/tofu.c (get_trust): Also show the binding when indicating a
conflict occurred.
--
Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
g10/tofu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/g10/tofu.c b/g10/tofu.c
index 0b5fa29..3f2cd25 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1468,10 +1468,10 @@ get_trust (struct db *dbs, const char *fingerprint, const char *email,
&& conflict && strcmp (conflict, fingerprint) != 0)
{
es_fprintf (fp,
- _("The key %s raised a conflict with this binding. Since"
- " this binding's policy was 'auto', it was changed to "
- "'ask'. "),
- conflict);
+ _("The key %s raised a conflict with this binding (%s)."
+ " Since this binding's policy was 'auto', it was"
+ "changed to 'ask'. "),
+ conflict, binding);
binding_shown = 1;
}
es_fprintf (fp,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list