From a6549ca548346765b14bc95ff70529babdd5d469 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 14 Dec 2007 16:08:53 +0000 Subject: Preparing a release candidate. --- g10/ChangeLog | 5 +++++ g10/gpg.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'g10') diff --git a/g10/ChangeLog b/g10/ChangeLog index 99e677eaf..90cf9003b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2007-12-14 Werner Koch + + * gpg.c (main): Set opt.no_homedir_creation during the first option + parsing pass. + 2007-12-12 Werner Koch * misc.c (print_pubkey_algo_note): Print a warning if a type 20 diff --git a/g10/gpg.c b/g10/gpg.c index 75d44f6ca..db7b6e129 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -1905,8 +1905,11 @@ main (int argc, char **argv ) default_config = 0; } else if( pargs.r_opt == oNoOptions ) + { default_config = 0; /* --no-options */ - else if( pargs.r_opt == oHomedir ) + opt.no_homedir_creation = 1; + } + else if( pargs.r_opt == oHomedir ) set_homedir ( pargs.r.ret_str ); else if( pargs.r_opt == oNoPermissionWarn ) opt.no_perm_warn=1; -- cgit v1.2.3