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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-06-01 20:39:43 +0000 (Sun, 01 Jun 2014)
New Revision: 634

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
Improve the documentation of gpgparticipants annotations.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2014-06-01 20:39:38 UTC (rev 633)
+++ trunk/caff/caff	2014-06-01 20:39:43 UTC (rev 634)
@@ -57,8 +57,11 @@
 to verify that key belongs to the recipient.
 
 The list of keys to sign can also be provided through caff's standard
-input, as gpgparticipants(1) formatted content.  Only keys annotated
-with "Fingerprint OK" and "ID OK" are be considered for signing.
+input, as gpgparticipants(1) formatted content.  Only keys for which
+both the "Fingerprint OK" and "ID OK" boxes are ticked (i.e., marked
+with an "x") are considered for signing.  Furthermore, the input header
+must include at least one checksum line, and all checksum boxes must be
+marked as verified (with an "x").
 
 =head1 OPTIONS
 
@@ -1233,8 +1236,8 @@
 					die "Unexpected input line: " .$_. "\n";
 				}
 			}
-			die "$md checksum wasn't verified!\n" unless lc $r eq 'x';
-			info "Found verified $md checksum (assumed good).";
+			die "$md checksum wasn't marked as verified!\n" unless lc $r eq 'x';
+			info "Found $md checksum (marked as verified, assumed good).";
 			push @checksums, uc $md;
 		}
 		elsif (/^(?:-+|_+)$/) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2014-06-01 20:39:38 UTC (rev 633)
+++ trunk/debian/changelog	2014-06-01 20:39:43 UTC (rev 634)
@@ -1,6 +1,8 @@
 signing-party (1.1.8-1) UNRELEASED; urgency=low
 
   [ Guilhem Moulin ]
+  * caff:
+    + Improve the documentation of gpgparticipants annotations.
   * gpgwrap:
     + Import the default Debian CFLAGS defined by dpkg-buildflags, which makes
       the Buildd Log Scanner stop emitting 'W-dpkg-buildflags-missing CFLAGS'.