diff options
| author | David Shaw <[email protected]> | 2003-10-14 23:30:14 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-10-14 23:30:14 +0000 |
| commit | 6ad91b2b3aca82f810f33c4f41ba84e0617a1c6f (patch) | |
| tree | a3ed28ddb50153e5cd40d47d0abf036489c15a69 | |
| parent | * keyedit.c (show_key_with_all_names): Ownertrust is only meaningful for (diff) | |
| download | gnupg-6ad91b2b3aca82f810f33c4f41ba84e0617a1c6f.tar.gz gnupg-6ad91b2b3aca82f810f33c4f41ba84e0617a1c6f.zip | |
* import.c (import_one): Show the keyid when giving the Elgamal slow
import warning.
* g10.c (main): Older versions used --comment "" to indicate no comment.
Don't add an empty comment.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/g10.c | 5 | ||||
| -rw-r--r-- | g10/import.c | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 2e1149c08..2c506c040 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2003-10-14 David Shaw <[email protected]> + + * import.c (import_one): Show the keyid when giving the Elgamal + slow import warning. + + * g10.c (main): Older versions used --comment "" to indicate no + comment. Don't add an empty comment. + 2003-10-13 David Shaw <[email protected]> * keyedit.c (show_key_with_all_names): Ownertrust is only @@ -1658,7 +1658,10 @@ main( int argc, char **argv ) break; case oSigKeyserverURL: add_keyserver_url(pargs.r.ret_str,0); break; case oUseEmbeddedFilename: opt.use_embedded_filename = 1; break; - case oComment: add_to_strlist(&opt.comments,pargs.r.ret_str); break; + case oComment: + if(pargs.r.ret_str[0]) + add_to_strlist(&opt.comments,pargs.r.ret_str); + break; case oDefaultComment: deprecated_warning(configname,configlineno, "--default-comment","--no-comments",""); diff --git a/g10/import.c b/g10/import.c index 8d94c3967..80b4f6749 100644 --- a/g10/import.c +++ b/g10/import.c @@ -560,8 +560,8 @@ import_one( const char *fname, KBNODE keyblock, uidnode = find_next_kbnode( keyblock, PKT_USER_ID ); if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) - log_info(_("NOTE: Elgamal primary key detected - " - "this may take some time to import\n")); + log_info(_("key %08lX: Elgamal primary key -" + " this may take some time to import\n"),(ulong)keyid[1]); if( opt.verbose && !opt.interactive ) { log_info( "pub %4u%c/%08lX %s ", |