[Cvs-cvs] ccvs/src ChangeLog sanity.sh

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/29 01:12:09

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        * sanity.sh: Handle GPG secret key import errors.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3385&tr2=1.3386&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1132&tr2=1.1133&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3385 ccvs/src/ChangeLog:1.3386
--- ccvs/src/ChangeLog:1.3385   Thu Apr 27 18:52:25 2006
+++ ccvs/src/ChangeLog  Sat Apr 29 01:12:08 2006
@@ -1,3 +1,7 @@
+2006-04-28  Derek Price  <address@hidden>
+
+       * sanity.sh: Handle GPG secret key import errors.
+
 2006-04-27  Derek Price  <address@hidden>
 
        * sanity.sh: Set a default for $GPG for when sanity.config.sh cannot be
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1132 ccvs/src/sanity.sh:1.1133
--- ccvs/src/sanity.sh:1.1132   Thu Apr 27 18:52:25 2006
+++ ccvs/src/sanity.sh  Sat Apr 29 01:12:08 2006
@@ -1892,7 +1892,11 @@
 =k49u
 -----END PGP PRIVATE KEY BLOCK-----
 EOF
-  if $GPG --import - <$TESTDIR/seckey >>$LOGFILE 2>&1; then :; else
+  # For some silly reason, at least GPG 1.0.6 doesn't retrun an error when it
+  # fails to import the secret key.
+  $GPG --import - <$TESTDIR/seckey >>$TESTDIR/gpg.tmp 2>&1
+  cat $TESTDIR/gpg.tmp >>$LOGFILE 2>&1
+  if grep 'allow-secret-key-import' $TESTDIR/gpg.tmp; then
     # 1.0.3 didn't support --allow-secret-key-import and sometime before
     # 1.4.2.2, the GPG man page marked it as obsolete.  Judging from the
     # absence of mention on the online man page, it may have since been dropped
@@ -1908,6 +1912,7 @@
       gpg=false
     fi
   fi
+  rm $TESTDIR/gpg.tmp
   rm $TESTDIR/seckey
 fi