diff options
| author | David Shaw <[email protected]> | 2003-01-03 21:41:53 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-01-03 21:41:53 +0000 |
| commit | e247a0b3e0d0895eda987b0d237794265ae27b68 (patch) | |
| tree | 11822fcd9dc48a9754edb8e65153e3a99355236d /g10/import.c | |
| parent | * keydb.c (keydb_add_resource): Don't assume that try_make_homedir (diff) | |
| download | gnupg-e247a0b3e0d0895eda987b0d237794265ae27b68.tar.gz gnupg-e247a0b3e0d0895eda987b0d237794265ae27b68.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index 8196d6c84..200b53360 100644 --- a/g10/import.c +++ b/g10/import.c @@ -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); |