diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/gpg.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 688d69829..c4170a522 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2007-12-14 Werner Koch <[email protected]> + + * gpg.c (main): Set opt.no_homedir_creation already on the first + option parsing pass. This is required so that the gpg_dearmor + tool won't create a ~/.gnupg. + 2007-12-12 Werner Koch <[email protected]> * misc.c (print_pubkey_algo_note): Print a warning for type 20 keys. @@ -1890,7 +1890,10 @@ main (int argc, char **argv ) default_config = 0; } else if( pargs.r_opt == oNoOptions ) + { default_config = 0; /* --no-options */ + opt.no_homedir_creation = 1; + } else if( pargs.r_opt == oHomedir ) set_homedir ( pargs.r.ret_str ); else if( pargs.r_opt == oNoPermissionWarn ) |