Don't let gpg2 fail if the option skeleton file is missing
This commit is contained in:
Werner Koch 2006-12-08 11:30:13 +00:00
parent 7b9eee1e5e
commit 71b6a940a3
3 changed files with 12 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2006-12-08 Werner Koch <wk@g10code.com>
* gnupg.texi (direntry): Rename gpg to gpg2.
2006-12-04 Werner Koch <wk@g10code.com>
* gpgv.texi: New.

View File

@ -1,3 +1,9 @@
2006-12-07 Werner Koch <wk@g10code.com>
* 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 <dshaw@jabberwocky.com>
* Makefile.am: Link to iconv for jnlib dependency.

View File

@ -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;