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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-11-17 16:06:23 +0000 (Mon, 17 Nov 2014)
New Revision: 734

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
Don't consider KEYEXPIRED and SIGEXPIRED as unknown reply from gpg.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2014-11-14 00:19:49 UTC (rev 733)
+++ trunk/caff/caff	2014-11-17 16:06:23 UTC (rev 734)
@@ -1384,7 +1384,7 @@
 			my $imported_key = $1;
 			notice ("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|IMPORT_RES|IMPORTED) /) {
+		} elsif (!/^\[GNUPG:\] (?:NODATA \d|IMPORT_RES .+|IMPORTED .+|KEYEXPIRED \d+|SIGEXPIRED(?: deprecated-use-keyexpired-instead)?)$/) {
 			notice ("Got unknown reply from gpg: ".$_);
 		}
 	};

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2014-11-14 00:19:49 UTC (rev 733)
+++ trunk/debian/changelog	2014-11-17 16:06:23 UTC (rev 734)
@@ -1,3 +1,12 @@
+signing-party (1.1.12-1) UNRELEASED; urgency=low
+
+  * caff:
+    + Don't consider KEYEXPIRED and SIGEXPIRED as unknown reply from gpg when
+      downloading a key containing a revoked subkey or UID from a keyserver.
+      (Closes: #769892)
+
+ -- Guilhem Moulin <guilhem at guilhem.org>  Mon, 17 Nov 2014 16:49:51 +0100
+
 signing-party (1.1.11-1) unstable; urgency=medium
 
   [ Thijs Kinkhorst ]