mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* import.c (import_one): Only do the work to create the status display for
interactive import if status is enabled. * keyring.c (keyring_search): skipfnc didn't work properly with non-keyid searches. Noted by Stefan Bellon. * getkey.c (merge_selfsigs_main): Remove some unused code and make sure that the pk selfsigversion member accounts for 1F direct sigs.
This commit is contained in:
parent
842e690f54
commit
e247a0b3e0
4 changed files with 27 additions and 10 deletions
|
@ -630,7 +630,8 @@ import_one( const char *fname, KBNODE keyblock,
|
|||
}
|
||||
|
||||
if (opt.interactive) {
|
||||
print_import_check (pk, uidnode->pkt->pkt.user_id);
|
||||
if(is_status_enabled())
|
||||
print_import_check (pk, uidnode->pkt->pkt.user_id);
|
||||
merge_keys_and_selfsig (keyblock);
|
||||
tty_printf ("\n");
|
||||
show_basic_key_info (keyblock);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue