security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

gpg: Improve output. 

* g10/tofu.c (get_trust): Also show the binding when indicating a
conflict occurred.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2015-10-20 14:53:29 +02:00
parent 251c070f91
commit bc9ff6c85e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/tofu.c
View 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,