Re: [Cvs-test-results] CVS trunk testing results (BSDI BSD/OS)

[Derek R. Price]

Derek R. Price wrote:
> Larry Jones wrote:
>> gpg: Invalid option "--allow-secret-key-import"
> 
> What version of GPG are you using?

Better yet, does the attached patch solve the problem?

Thanks,

Derek
-- 
Derek R. Price
CVS Solutions Architect
Ximbiot <http://ximbiot.com>
v: +1 248.835.1260
f: +1 248.835.1263
<address@hidden>

Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1129
diff -u -p -r1.1129 sanity.sh
--- src/sanity.sh       26 Apr 2006 17:27:35 -0000      1.1129
+++ src/sanity.sh       27 Apr 2006 15:18:02 -0000
@@ -1853,7 +1853,7 @@ B0RRhW3h2s/P7BCMAKDKqifj54oz/mJotQABGP13
 =7ufq
 -----END PGP PUBLIC KEY BLOCK-----
 EOF
-  $GPG --allow-secret-key-import --import - <<EOF >>$LOGFILE 2>&1
+  cat >$TESTDIR/seckey <<EOF 2>>$LOGFILE
 -----BEGIN PGP PRIVATE KEY BLOCK-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
@@ -1888,6 +1888,22 @@ B2xyFA1/6G+hv7k=
 =k49u
 -----END PGP PRIVATE KEY BLOCK-----
 EOF
+  if $GPG --import - <$TESTDIR/seckey >>$LOGFILE 2>&1; then :; else
+    if $GPG --allow-secret-key-import --import - <$TESTDIR/seckey \
+           >>$LOGFILE 2>&1; then :; else
+      echo "WARNING: Unable to import private keys into GPG.  This test" >&2
+      echo "suite will run, but OpenPGP commit signatures will not be" >&2
+      echo "tested." >&2
+      rm -r $HOME/.gnupg
+      CVS_SIGN_COMMITS=off; export CVS_SIGN_COMMITS
+      CVS_VERIFY_CHECKOUTS=off; export CVS_VERIFY_CHECKOUTS
+      gpg=false
+    fi
+  fi
+  rm $TESTDIR/seckey
+fi
+
+if $gpg; then
   $GPG --import-ownertrust <<EOF >>$LOGFILE 2>&1
 F1D6D5842814BC3A264BE7068E0C2C7EF133BDE9:6:
 EOF