[svn] GnuPG - r4986 - trunk/tests/openpgp

[svn author wk]

Author: wk
Date: 2009-04-19 18:34:21 +0200 (Sun, 19 Apr 2009)
New Revision: 4986

Modified:
   trunk/tests/openpgp/ChangeLog
   trunk/tests/openpgp/mkdemodirs
Log:
Fix problem with incompatible gpg.conf files.


Modified: trunk/tests/openpgp/ChangeLog
===================================================================
--- trunk/tests/openpgp/ChangeLog	2009-04-17 18:40:32 UTC (rev 4985)
+++ trunk/tests/openpgp/ChangeLog	2009-04-19 16:34:21 UTC (rev 4986)
@@ -1,3 +1,7 @@
+2009-04-19  Werner Koch  <wk at g10code.com>
+
+	* mkdemodirs (GPG): Use --no-options.
+
 2008-09-29  Werner Koch  <wk at g10code.com>
 
 	* clearsig.test: Replace -sat by --clearsign.

Modified: trunk/tests/openpgp/mkdemodirs
===================================================================
--- trunk/tests/openpgp/mkdemodirs	2009-04-17 18:40:32 UTC (rev 4985)
+++ trunk/tests/openpgp/mkdemodirs	2009-04-19 16:34:21 UTC (rev 4986)
@@ -2,7 +2,11 @@
 
 set -e
 
-GPG="../g10/gpg2 --batch --quiet --no-secmem-warning --allow-secret-key-import"
+# We need to use --no-options so that a gpg.conf from an older version
+# of gpg is not used.
+GPG="../g10/gpg2 --no-options --batch --quiet
+     --no-secmem-warning --allow-secret-key-import"
+
 NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
        Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
        Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'