From: weasel <weasel@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Sat, 31 Jul 2010 11:35:35 +0000 (+0000)
Subject: caff: do not stop after importing all keys from the user's gpg dir
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=7f7e306a21053c9ad7676fe61bbfc2f466554515;p=pgp-tools.git

caff: do not stop after importing all keys from the user's gpg dir

Even if all keys to sign were found in the user's normal gpg keyrings we still
need to import them (again) from any keyrings passed with --key-files - the
keys there might be newer, containing new subkeys (for encryption), uids (for
signing) or revocations.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@474 b513b33f-fedd-0310-b452-c3deb5f4c849
---

diff --git a/caff/caff b/caff/caff
index 99710ce..4467f95 100755
--- a/caff/caff
+++ b/caff/caff
@@ -1039,18 +1039,12 @@ sub import_key_files($$) {
 sub import_keys_to_sign() {
     # Check if we can find the gpg key from our normal gnupghome, and then
     # try to import it into our working gnupghome directory
-    my $imported_keys = 0;
     foreach my $keyid (@KEYIDS) {
         if (!import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
             info("Key $keyid imported from your normal GnuPGHOME.");
-            $imported_keys++;
         }
     }
 
-    # If all of the keys have been successfully imported, there is no need to
-    # go further
-    return 1 if ($imported_keys == scalar (@KEYIDS));
-
     # Import user specified key files
     foreach my $keyfile (@{$CONFIG{'key-files'}}) {
         import_key_files($keyfile, $GNUPGHOME);
diff --git a/debian/changelog b/debian/changelog
index a8d1fc3..31b8ed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,12 @@ signing-party (1.1.4-1) UNRELEASED; urgency=low
       just to /usr/share/doc/signing-party/caff/caffrc.sample
       (closes: #568052).
     + Fix horrible &function calls used because of broken prototypes.
+    + Even if all keys to sign were found in the user's normal gpg
+      keyrings we still need to import them (again) from any keyrings
+      passed with --key-files - the keys there might be newer, containing
+      new subkeys (for encryption), uids (for signing) or revocations.
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 31 Jul 2010 13:12:41 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sat, 31 Jul 2010 13:18:38 +0200
 
 signing-party (1.1.3-1) unstable; urgency=low