From 4957e3236796979b58f35628351505ea5f4e936a Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 20 Oct 2015 13:40:37 +0200 Subject: gpg: Use the right variable to display the information. * g10/tofu.c (get_trust): Use the right variable to display the conflicting key. -- Signed-off-by: Neal H. Walfield Reported-by: Andre Heinecke --- g10/tofu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/g10/tofu.c b/g10/tofu.c index f97a3f781..f9aa68fc8 100644 --- a/g10/tofu.c +++ b/g10/tofu.c @@ -1456,9 +1456,10 @@ get_trust (struct db *dbs, const char *fingerprint, const char *email, && conflict && strcmp (conflict, fingerprint) != 0) { es_fprintf (fp, - _("%s raised a conflict with this binding. Since this" - " binding's policy was 'auto', it was changed to 'ask'. "), - binding); + _("The key %s raised a conflict with this binding. Since" + " this binding's policy was 'auto', it was changed to " + "'ask'. "), + conflict); binding_shown = 1; } es_fprintf (fp, -- cgit v1.2.3