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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-07-12 19:34:48 +0000 (Tue, 12 Jul 2016)
New Revision: 871

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
caff: Automatically import the {'also-encrypt-to'} from the normal GnuPGHOME.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-07-12 19:34:44 UTC (rev 870)
+++ trunk/caff/caff	2016-07-12 19:34:48 UTC (rev 871)
@@ -1082,8 +1082,6 @@
                 if (grep { $_ eq $keyid } @{$CONFIG{'also-encrypt-to'}}) {
                     mywarn "Could not encrypt to $keyid, specified in CONFIG{'also-encrypt-to'}";
                     mywarn "Try to update the key using gpg --homedir=$GNUPGHOME --import <exported key>";
-                    mywarn "or try the following if you are slightly more daring:";
-                    mywarn "  gpg --export $keyid | gpg --homedir=$GNUPGHOME --import";
                     return;
                 };
             };
@@ -1603,6 +1601,7 @@
 # import own keys and keys to sign
 ##################################
 import_keys_from_gnupghome($CONFIG{'keyid'}, undef, $GNUPGHOME, 1);
+import_keys_from_gnupghome($CONFIG{'also-encrypt-to'}, undef, $GNUPGHOME, 0) if defined $CONFIG{'also-encrypt-to'};
 @LOCAL_USER = get_local_user_keys() unless $CONFIG{'no-sign'};
 
 import_keys_to_sign(\@KEYIDS);

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2016-07-12 19:34:44 UTC (rev 870)
+++ trunk/debian/changelog	2016-07-12 19:34:48 UTC (rev 871)
@@ -19,6 +19,8 @@
       $CONFIG{'keyid'} and $CONFIG{'local-users'} are kept to 64-bits key IDs
       as per RFC 4880 full fingerprints are not available in key signatures,
       and thus not exposed by `gpg --with-colons --list-sigs`.)
+    + Automatically import the $CONFIG{'also-encrypt-to'} from the normal
+      GnuPGHOME when possible.
   * d/source.lintian-overrides: Add 'debian-watch-file-is-missing' as we're
     upstream.