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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-07-11 22:36:00 +0000 (Mon, 11 Jul 2016)
New Revision: 859

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
caff: Ignore "KEY_CONSIDERED" status output emitted by gpg 2.1.13 and later.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-07-10 20:01:44 UTC (rev 858)
+++ trunk/caff/caff	2016-07-11 22:36:00 UTC (rev 859)
@@ -1569,7 +1569,14 @@
             my $imported_key = $1;
             mywarn("Imported v3 key $1.  Version 3 keys are obsolete, should not be used, and are not and will not be properly supported.");
             $had_v3_keys = 1;
-        } elsif (!/^\[GNUPG:\] (?:NODATA \d|IMPORT_RES .+|IMPORTED .+|KEYEXPIRED \d+|SIGEXPIRED(?: deprecated-use-keyexpired-instead)?)$/) {
+        } elsif (!/^\[GNUPG:\]\ (?:NODATA\ \d
+                                 | IMPORT_RES\ .+
+                                 | IMPORTED\ .+
+                                 | KEYEXPIRED\ \d+
+                                 | SIGEXPIRED\ (?:\ deprecated-use-keyexpired-instead)?
+                                 | KEY_CONSIDERED\ [0-9A-F]{40}\ \d+
+                                 | FAILURE\ recv-keys\ \d+
+                                 )$/x) {
             mywarn("Got unknown reply from gpg: ".$_);
         }
     };

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2016-07-10 20:01:44 UTC (rev 858)
+++ trunk/debian/changelog	2016-07-11 22:36:00 UTC (rev 859)
@@ -1,7 +1,7 @@
 signing-party (2.4-1) UNRELEASED; urgency=medium
 
-  * gpg-key2latex, gpgsigs: Ignore "KEY_CONSIDERED" status output emitted by
-    gpg 2.1.13 and later.
+  * caff, gpg-key2latex, gpgsigs: Ignore "KEY_CONSIDERED" status output
+    emitted by gpg 2.1.13 and later.
   * caff, gpgsigs: Allow input produced by gpgparticipants(1) using gpg
     2.1.13.  With this version, key IDs are not displayed by default and the
     "Key fingerprint = " prefix is omitted.