diff options
| author | David Shaw <[email protected]> | 2002-12-26 22:22:50 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-26 22:22:50 +0000 |
| commit | f3f1015f6a82482dd6075343d41f4aca1e795e48 (patch) | |
| tree | c67b1a5f42380195a65378b229867eadce93d278 /g10/import.c | |
| parent | * iobuf.c (iobuf_flush): Only print debug info if debugging is on. (diff) | |
| download | gnupg-f3f1015f6a82482dd6075343d41f4aca1e795e48.tar.gz gnupg-f3f1015f6a82482dd6075343d41f4aca1e795e48.zip | |
* keydb.h, getkey.c (key_byname): Flag to enable or disable including
disabled keys. Keys specified via keyid (i.e. 0x...) are always included.
* getkey.c (get_pubkey_byname, get_seckey_byname2, get_seckey_bynames),
keyedit.c (keyedit_menu, menu_addrevoker): Include disabled keys in these
functions.
* pkclist.c (build_pk_list): Do not include disabled keys for -r or the
key prompt. Do include disabled keys for the default key and
--encrypt-to.
* trustdb.h, trustdb.c (is_disabled): New skipfnc for skipping disabled
keys.
* gpgv.c (is_disabled): Stub.
* keygen.c (keygen_add_key_expire): Properly handle updating a key
expiration to a no-expiration value.
* keyedit.c (enable_disable_key): Comment.
* import.c (import_one): When in interactive mode and --verbose, don't
repeat some key information twice.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index f06799df0..46e4b2530 100644 --- a/g10/import.c +++ b/g10/import.c @@ -614,7 +614,7 @@ import_one( const char *fname, KBNODE keyblock, log_info(_("NOTE: Elgamal primary key detected - " "this may take some time to import\n")); - if( opt.verbose ) { + if( opt.verbose && !opt.interactive ) { log_info( "pub %4u%c/%08lX %s ", nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), |