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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-04-20 08:33:14 +0000 (Mon, 20 Apr 2015)
New Revision: 805

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
caff: Only consider non-expired/invalid/revoked keys and UIDs when generating the caffrc.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2015-04-20 08:33:07 UTC (rev 804)
+++ trunk/caff/caff	2015-04-20 08:33:14 UTC (rev 805)
@@ -530,13 +530,13 @@
             mywarn "No data from gpg for list-key"; # There should be at least 'tru:' everywhere.
         };
 
-        @keys = ($output{stdout} =~ /^pub:[^r:]*:(?:[^:]*:){2}([0-9A-F]{16}):/mg);
+        @keys = ($output{stdout} =~ /^pub:[^eir:]*:(?:[^:]*:){2}([0-9A-F]{16}):/mg);
         unless (scalar @keys) {
             notice("Error: No keys were found using \"gpg --list-public-keys '$gecos'\"", 0);
             @keys = qw{0123456789abcdef 89abcdef76543210};
             $Ckeys = '#';
         }
-        ($email) = ($output{stdout} =~ /^uid:(?:[^:]*:){8}[^:]+ <([^:]+\@[^:]+)>(?::.*)?$/m);
+        ($email) = ($output{stdout} =~ /^uid:[^eir:]*:(?:[^:]*:){7}[^:]+ <([^:]+\@[^:]+)>(?::.*)?$/m);
         unless (defined $email) {
             notice("Error: No email address was found using \"gpg --list-public-keys '$gecos'\"", 0);
             $email = $ENV{'LOGNAME'}.'@'.$hostname;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-04-20 08:33:07 UTC (rev 804)
+++ trunk/debian/changelog	2015-04-20 08:33:14 UTC (rev 805)
@@ -1,3 +1,11 @@
+signing-party (2.1-1) UNRELEASED; urgency=low
+
+  * caff:
+    + Only consider non-expired/invalid/revoked keys and UIDs when generating
+      the caffrc.
+
+ -- Guilhem Moulin <guilhem at guilhem.org>  Mon, 20 Apr 2015 10:28:20 +0200
+
 signing-party (2.0-1) unstable; urgency=low
 
   * caff: