gpg: Use the right variable to display the information.
authorNeal H. Walfield <neal@g10code.com>
Tue, 20 Oct 2015 11:40:37 +0000 (13:40 +0200)
committerNeal H. Walfield <neal@g10code.com>
Tue, 20 Oct 2015 11:40:37 +0000 (13:40 +0200)
* g10/tofu.c (get_trust): Use the right variable to display the
conflicting key.

--
Signed-off-by: Neal H. Walfield <neal@walfield.org>
Reported-by: Andre Heinecke <aheinecke@intevation.de>
g10/tofu.c

index f97a3f7..f9aa68f 100644 (file)
@@ -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,