[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog sanity.sh
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog sanity.sh |
Date: |
Thu, 27 Apr 2006 17:31:32 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Derek Robert Price <address@hidden> 06/04/27 17:31:32
Modified files:
src : ChangeLog sanity.sh
Log message:
* sanity.sh: Some versions of GPG don't like --allow-import-secret-key
option. Deal with that.
(Report from Larry Jones <address@hidden>.)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3382&tr2=1.3383&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1129&tr2=1.1130&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3382 ccvs/src/ChangeLog:1.3383
--- ccvs/src/ChangeLog:1.3382 Wed Apr 26 17:27:35 2006
+++ ccvs/src/ChangeLog Thu Apr 27 17:31:32 2006
@@ -1,3 +1,9 @@
+2006-04-27 Derek Price <address@hidden>
+
+ * sanity.sh: Some versions of GPG don't like --allow-import-secret-key
+ option. Deal with that.
+ (Report from Larry Jones <address@hidden>.)
+
2006-04-26 Derek Price <address@hidden>
Mark D. Baushke <address@hidden>
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1129 ccvs/src/sanity.sh:1.1130
--- ccvs/src/sanity.sh:1.1129 Wed Apr 26 17:27:35 2006
+++ ccvs/src/sanity.sh Thu Apr 27 17:31:32 2006
@@ -1853,7 +1853,7 @@
=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 @@
=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
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/04/07
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Mark D. Baushke, 2006/04/25
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/04/25
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/04/26
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh,
Derek Robert Price <=
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/04/27
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/04/27
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/04/28