[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: |
Wed, 26 Apr 2006 17:27:35 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Derek Robert Price <address@hidden> 06/04/26 17:27:35
Modified files:
src : ChangeLog sanity.sh
Log message:
* sanity.sh: Use --no-secmem-warning to suppress GPG warnings.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3381&tr2=1.3382&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1128&tr2=1.1129&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3381 ccvs/src/ChangeLog:1.3382
--- ccvs/src/ChangeLog:1.3381 Wed Apr 26 03:26:36 2006
+++ ccvs/src/ChangeLog Wed Apr 26 17:27:35 2006
@@ -1,3 +1,8 @@
+2006-04-26 Derek Price <address@hidden>
+ Mark D. Baushke <address@hidden>
+
+ * sanity.sh: Use --no-secmem-warning to suppress GPG warnings.
+
2006-04-25 Derek Price <address@hidden>
* import.c (add_rcs_file): Don't trace NULL strings directly for
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1128 ccvs/src/sanity.sh:1.1129
--- ccvs/src/sanity.sh:1.1128 Tue Apr 25 19:08:58 2006
+++ ccvs/src/sanity.sh Wed Apr 26 17:27:35 2006
@@ -1788,8 +1788,17 @@
# Output a warning to the user if GPG is installed incorrectly.
if grep 'insecure memory' gpg.tmp >/dev/null; then
- # If the warning can't be suppressed with --quiet, then skip GPG testing.
- if $GPG --list-keys --quiet 2>&1 |grep 'insecure memory' >/dev/null; then
+ echo Adding 'no-secmem-warning' to $HOME/.gnupg/options >>$LOGFILE 2>&1
+ echo no-secmem-warning >$HOME/.gnupg/options
+ $GPG --list-keys >$TESTDIR/gpg.tmp 2>&1
+ cat $TESTDIR/gpg.tmp >>$LOGFILE 2>&1
+ if grep 'invalid option' gpg.tmp >/dev/null; then
+ echo Removing $HOME/.gnupg/options as it did not help. >>$LOGFILE 2>&1
+ rm $HOME/.gnupg/options
+ fi
+ # If the warning can't be suppressed with no-secmem-warning, then skip GPG
+ # testing.
+ if $GPG --list-keys 2>&1 |grep 'insecure memory' >/dev/null; then
echo "WARNING: GPG is installed incorrectly (\`$GPG' needs set" >&2
echo "setuid root to avoid using insecure memory). This test suite" >&2
echo "will run, but OpenPGP commit signatures will not be tested." >&2
@@ -1890,6 +1899,8 @@
'
log_keyid="OpenPGP signature using key ID 0x[0-9a-f]*;
"
+ # It might be cleaner to do this in the options file, but then some tests
+ # that turn GPG's chattiness back up would need to be rewritten.
CVS_VERIFY_TEMPLATE="`echo $DEFAULT_VERIFY_TEMPLATE \
|sed 's/ -- / --quiet -- /'` 2>/dev/null"
export CVS_VERIFY_TEMPLATE
- [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 <=
- [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/27
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/04/28