[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2] |
Date: |
Thu, 27 Oct 2005 22:35:28 -0400 |
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1095.4.1 ccvs/src/sanity.sh:1.1095.4.2
--- ccvs/src/sanity.sh:1.1095.4.1 Thu Oct 20 21:33:11 2005
+++ ccvs/src/sanity.sh Fri Oct 28 02:35:14 2005
@@ -1686,6 +1686,7 @@
HOME=$TESTDIR/home; export HOME
# If $GPG is set, create a key for /uu
+OPENPGP_PHRASE=
if test x"$GPG" != xgpg; then
$GPG --list-keys >>$LOGFILE 2>&1
$GPG --import - <<EOF >>$LOGFILE 2>&1
@@ -1756,7 +1757,14 @@
=k49u
-----END PGP PRIVATE KEY BLOCK-----
EOF
+
+ # Some tests check the content of the RCS file and whether there is a
+ # signature phrase or not depends on whether they were being generated.
+ OPENPGP_PHRASE='openpgp-signatures @[a-zA-Z0-9/+]*=*@;'
fi # GPG set
+# Add the trailing EOL, always.
+OPENPGP_PHRASE="$OPENPGP_PHRASE
+"
# Make sure this variable is not defined to anything that would
@@ -22515,7 +22523,7 @@
branches;
next ;
commitid ${commitid};
-
+$OPENPGP_PHRASE
desc
@@
@@ -26364,13 +26372,13 @@
1\.1\.2\.1;
next ;
commitid ${commitid};
-
+$OPENPGP_PHRASE
1\.1\.2\.1
date ${RCSDELTADATE}; author ${username}; state foo;
branches;
next ;
commitid ${commitid};
-
+$OPENPGP_PHRASE
desc
@@
@@ -26785,13 +26793,13 @@
1\.1\.2\.1;
next ;
commitid ${commitid};
-
+$OPENPGP_PHRASE
1\.1\.2\.1
date ${RCSDELTADATE}; author ${username}; state foo;
branches;
next ;
commitid ${commitid};
-
+$OPENPGP_PHRASE
desc
@@
@@ -26960,19 +26968,19 @@
branches;
next 1\.3;
commitid ${commitid};
-
+$OPENPGP_PHRASE
1\.3
date ${RCSDELTADATE}; author ${username}; state Exp;
branches;
next 1\.2;
commitid ${commitid};
-
+$OPENPGP_PHRASE
1\.2
date ${RCSDELTADATE}; author ${username}; state Exp;
branches;
next ;
commitid ${commitid};
-
+$OPENPGP_PHRASE
desc
@@