diff options
| author | Neal H. Walfield <[email protected]> | 2015-10-20 12:53:29 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-10-20 12:53:29 +0000 |
| commit | bc9ff6c85e2d89be4ee873b8a72a214759a66157 (patch) | |
| tree | 72640832768139b6177b676501f377610bbaf546 | |
| parent | gpg: Synchronize translation template. (diff) | |
| download | gnupg-bc9ff6c85e2d89be4ee873b8a72a214759a66157.tar.gz gnupg-bc9ff6c85e2d89be4ee873b8a72a214759a66157.zip | |
gpg: Improve output.
* g10/tofu.c (get_trust): Also show the binding when indicating a
conflict occurred.
--
Signed-off-by: Neal H. Walfield <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/tofu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/tofu.c b/g10/tofu.c index 0b5fa29df..3f2cd2512 100644 --- a/g10/tofu.c +++ b/g10/tofu.c @@ -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, |