gpg: Improve output.
authorNeal H. Walfield <neal@g10code.com>
Tue, 20 Oct 2015 12:53:29 +0000 (14:53 +0200)
committerNeal H. Walfield <neal@g10code.com>
Tue, 20 Oct 2015 12:53:29 +0000 (14:53 +0200)
* g10/tofu.c (get_trust): Also show the binding when indicating a
conflict occurred.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
g10/tofu.c

index 0b5fa29..3f2cd25 100644 (file)
@@ -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,