gpg: If a conflict occurs in batch mode, record that.
authorNeal H. Walfield <neal@g10code.com>
Mon, 19 Oct 2015 08:34:15 +0000 (10:34 +0200)
committerNeal H. Walfield <neal@g10code.com>
Mon, 19 Oct 2015 08:34:15 +0000 (10:34 +0200)
commit55d88454652543c98d74376977d855e394df6c92
tree32e43049ee2cbdc8946f0d0ccaff28ca4951a72b
parentc2c400714854d5a127a6966200d345d0d6cfc7d4
gpg: If a conflict occurs in batch mode, record that.

* g10/tofu.c (get_trust): If a conflict occurs when MAY_ASK is false,
set conflict to the key.  When prompting the user, don't show the
conflicting key if the conflicting key is the current key.

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