[svn] GnuPG - r5344 - in branches/STABLE-BRANCH-1-4: . g10

[svn author wk]

Author: wk
Date: 2010-06-01 14:13:31 +0200 (Tue, 01 Jun 2010)
New Revision: 5344

Modified:
   branches/STABLE-BRANCH-1-4/NEWS
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/gpg.c
Log:
Ignore some GnuPG-2 only options.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2010-05-30 12:06:38 UTC (rev 5343)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2010-06-01 12:13:31 UTC (rev 5344)
@@ -1,3 +1,8 @@
+2010-06-01  Werner Koch  <wk at g10code.com>
+
+	* gpg.c (main): Add dummy option --debug-level and ignore
+	--log-file if a socket prefix is given.
+
 2010-05-12  Werner Koch  <wk at g10code.com>
 
 	* armor.c (radix64_read): Change fix 2006-04-08 to fix bug#1179.

Modified: branches/STABLE-BRANCH-1-4/NEWS
===================================================================
--- branches/STABLE-BRANCH-1-4/NEWS	2010-05-30 12:06:38 UTC (rev 5343)
+++ branches/STABLE-BRANCH-1-4/NEWS	2010-06-01 12:13:31 UTC (rev 5344)
@@ -3,6 +3,7 @@
 
     * Bug fixes.
 
+
 Noteworthy changes in version 1.4.10 (2009-09-02)
 -------------------------------------------------
 

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2010-05-30 12:06:38 UTC (rev 5343)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2010-06-01 12:13:31 UTC (rev 5344)
@@ -188,6 +188,7 @@
     oOptions,
     oDebug,
     oDebugAll,
+    oDebugLevel,
     oDebugCCIDDriver,
     oStatusFD,
     oStatusFile,
@@ -513,6 +514,7 @@
     { oOptions, "options", 2, "@"},
     { oDebug, "debug"     ,4|16, "@"},
     { oDebugAll, "debug-all" ,0, "@"},
+    { oDebugLevel, "debug-level" ,0, "@"},
     { oStatusFD, "status-fd" ,1, "@"},
     { oStatusFile, "status-file" ,2, "@"},
     { oAttributeFD, "attribute-fd" ,1, "@" },
@@ -2202,6 +2204,7 @@
 	    break;
 	  case oDebug: opt.debug |= pargs.r.ret_ulong; break;
 	  case oDebugAll: opt.debug = ~0; break;
+          case oDebugLevel: break; /* Not supported.  */
           case oDebugCCIDDriver: 
 #if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB)
             ccid_set_debug_level (ccid_set_debug_level (1)+1);
@@ -2224,7 +2227,11 @@
                              iobuf_translate_file_handle (pargs.r.ret_int, 1));
             break;
 	  case oLoggerFile:
-            log_set_logfile( NULL, open_info_file (pargs.r.ret_str, 1) );
+            /* Our log code does not support the socket feature.  Thus
+               we ignore such log files to avoid problems with
+               gpg.conf files which are also used by gpg2.  */
+            if (strncmp (pargs.r.ret_str, "socket://", 9))
+              log_set_logfile( NULL, open_info_file (pargs.r.ret_str, 1) );
             break;
 
 	  case oWithFingerprint: