X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=4467f952ffb12393c75e5c8116cc4dc7bca453c0;hb=7f7e306a21053c9ad7676fe61bbfc2f466554515;hp=99710ced34221c131e99cf06ab6a27432db72440;hpb=cea1b97389b93ead834356681c602d54999e4254;p=pgp-tools.git

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);