[svn] GnuPG - r4376 - in trunk: doc g10

[svn author wk]

Author: wk
Date: 2006-12-08 12:30:13 +0100 (Fri, 08 Dec 2006)
New Revision: 4376

Modified:
   trunk/doc/ChangeLog
   trunk/g10/ChangeLog
   trunk/g10/openfile.c
Log:
Doc fix.
Don't let gpg2 fail if the option skeleton file is missing


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2006-12-08 04:39:56 UTC (rev 4375)
+++ trunk/doc/ChangeLog	2006-12-08 11:30:13 UTC (rev 4376)
@@ -1,3 +1,7 @@
+2006-12-08  Werner Koch  <wk at g10code.com>
+
+	* gnupg.texi (direntry): Rename gpg to gpg2.
+
 2006-12-04  Werner Koch  <wk at g10code.com>
 
 	* gpgv.texi: New.

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-12-08 04:39:56 UTC (rev 4375)
+++ trunk/g10/ChangeLog	2006-12-08 11:30:13 UTC (rev 4376)
@@ -1,3 +1,9 @@
+2006-12-07  Werner Koch  <wk at 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 at jabberwocky.com>
 
 	* Makefile.am: Link to iconv for jnlib dependency.

Modified: trunk/g10/openfile.c
===================================================================
--- trunk/g10/openfile.c	2006-12-08 04:39:56 UTC (rev 4375)
+++ trunk/g10/openfile.c	2006-12-08 11:30:13 UTC (rev 4376)
@@ -342,7 +342,7 @@
         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 @@
       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;