[Pkg-gnupg-commit] [gnupg2] 27/241: gpg: Use the right variable to display the information.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 4957e3236796979b58f35628351505ea5f4e936a
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Oct 20 13:40:37 2015 +0200

    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 <neal at walfield.org>
    Reported-by: Andre Heinecke <aheinecke at intevation.de>
---
 g10/tofu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index f97a3f7..f9aa68f 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git