[Pgp-tools-commit] r819 - in trunk: caff debian

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-09-02 08:45:35 +0000 (Wed, 02 Sep 2015)
New Revision: 819

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
"gpgparticipants"-formated input: accept key blocks not starting with a number.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2015-08-24 18:49:09 UTC (rev 818)
+++ trunk/caff/caff	2015-09-02 08:45:35 UTC (rev 819)
@@ -1325,7 +1325,7 @@
         elsif (/^(?:-+|_+)$/) {
             $goodblock = 0;
         }
-        elsif (/^(#*)(?:\d+)\s+\[(.)\] Fingerprint(?:\(s\)|s)? OK\s+\[(.)\] ID OK\s*$/) {
+        elsif (/^(#*)\d*\s+\[(.)\] Fingerprint(?:\(s\)|s)? OK\s+\[(.)\] ID OK\s*$/) {
             $goodblock = (!$1 and lc $2 eq 'x' and lc $3 eq 'x') ? 1 : 0;
         }
         elsif (/^\s+Key fingerprint = ([A-F0-9]{32}|(?:[A-F0-9]{2} ){8}(?: [A-F0-9]{2}){8})$/) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-08-24 18:49:09 UTC (rev 818)
+++ trunk/debian/changelog	2015-09-02 08:45:35 UTC (rev 819)
@@ -1,5 +1,11 @@
 signing-party (2.2-1) UNRELEASED; urgency=low
 
+  * caff:
+    + "gpgparticipants"-formated input: accept key blocks not starting with a
+      number such as
+            [x] Fingerprint(s) OK        [x] ID OK
+      This makes caff able to process the Debconf 15 KSP file.  (Closes:
+      #797714)
   * gpglist:
     + Don't prune revoked UIDs with a subsequent selfsig.  (Closes: #796664)
     + Add an option '--show-revoked' to show revoked UIDs.  Thanks Tomasz