From 71b6a940a3e055fdcae4b23a3941e7c6d35185df Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 8 Dec 2006 11:30:13 +0000 Subject: [PATCH] Doc fix. Don't let gpg2 fail if the option skeleton file is missing --- doc/ChangeLog | 4 ++++ g10/ChangeLog | 6 ++++++ g10/openfile.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index aac2a912a..2147e77ab 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2006-12-08 Werner Koch + + * gnupg.texi (direntry): Rename gpg to gpg2. + 2006-12-04 Werner Koch * gpgv.texi: New. diff --git a/g10/ChangeLog b/g10/ChangeLog index 4bc6b630d..91c9b554a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2006-12-07 Werner Koch + + * openfile.c (copy_options_file): Use log_info instead of + log_error to avoid an error return of gpg due to a missing + skeleton file. + 2006-12-07 David Shaw * Makefile.am: Link to iconv for jnlib dependency. diff --git a/g10/openfile.c b/g10/openfile.c index 6f004ecf1..381f93bd2 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -342,7 +342,7 @@ copy_options_file( const char *destdir ) errno = EPERM; } if( !src ) { - log_error(_("can't open `%s': %s\n"), fname, strerror(errno) ); + log_info (_("can't open `%s': %s\n"), fname, strerror(errno) ); xfree(fname); return; } @@ -357,7 +357,7 @@ copy_options_file( const char *destdir ) dst = fopen( fname, "w" ); umask(oldmask); if( !dst ) { - log_error(_("can't create `%s': %s\n"), fname, strerror(errno) ); + log_info (_("can't create `%s': %s\n"), fname, strerror(errno) ); fclose( src ); xfree(fname); return;