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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-09-12 12:16:42 +0000 (Mon, 12 Sep 2016)
New Revision: 878

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
Fix regression skipping --recv-key when 'keys-from-gnupg' isn't set.

Regression introduced in r864.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-09-08 15:53:49 UTC (rev 877)
+++ trunk/caff/caff	2016-09-12 12:16:42 UTC (rev 878)
@@ -1346,7 +1346,7 @@
 #
 sub import_keys_to_sign($) {
     my $keyids = shift;
-    return unless $CONFIG{'keys-from-gnupg'} or @{$CONFIG{'key-files'}} or $CONFIG{'no-download'};
+    return unless $CONFIG{'keys-from-gnupg'} or @{$CONFIG{'key-files'}} or !$CONFIG{'no-download'};
 
     # map each keyid to a list of matching fingerprints; there is a
     # collision if a keyid is mapped to multiple fingerprints, but we'll

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2016-09-08 15:53:49 UTC (rev 877)
+++ trunk/debian/changelog	2016-09-12 12:16:42 UTC (rev 878)
@@ -1,8 +1,11 @@
 signing-party (2.5-1) UNRELEASED; urgency=low
 
-  * caff: Show how to set $ENV{'PERL_MAILERS'} to specify a sendmail binary
-    (or use a sendmail-compatible MTA such as msmtp(1)).  Credits to Ryan
-    Kavanagh's blog post.
+  * caff:
+    + Show how to set $ENV{'PERL_MAILERS'} to specify a sendmail binary (or
+      use a sendmail-compatible MTA such as msmtp(1)).  Credits to Ryan
+      Kavanagh's blog post.
+    + Fix regression (introduced in 2.4-1) skipping --recv-key when
+      'keys-from-gnupg' isn't set.  (Closes: #837406)
   * gpg-key2latex: Add an option '--qrcode-data' to specify the data to encode
     in a QR code (default: "OPENPGP4FPR:%f").