diff options
| author | Neal H. Walfield <[email protected]> | 2015-10-20 11:40:37 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-10-20 11:40:37 +0000 |
| commit | 4957e3236796979b58f35628351505ea5f4e936a (patch) | |
| tree | a6eca44e8c62bb3190ff8615e171c69a73d1b695 | |
| parent | gpg: Make failing to create a directory a soft error. (diff) | |
| download | gnupg-4957e3236796979b58f35628351505ea5f4e936a.tar.gz gnupg-4957e3236796979b58f35628351505ea5f4e936a.zip | |
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 <[email protected]>
Reported-by: Andre Heinecke <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/tofu.c | 7 |
1 files 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, |