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

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index f32d5b5da615e71526f8c3cc2e32045f969490db..4467f952ffb12393c75e5c8116cc4dc7bca453c0 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -305,7 +305,7 @@ http://pgp-tools.alioth.debian.org/
 
 =head1 SEE ALSO
 
-gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caff/caffrc.sample.
+gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caff/
 
 =cut
 
@@ -325,6 +325,7 @@ use GnuPG::Interface;
 my %CONFIG;
 my $REVISION = '$Rev$';
 my ($REVISION_NUMER) = $REVISION =~ /(\d+)/;
+$REVISION_NUMER = 'unknown' unless defined $REVISION_NUMER;
 my $VERSION = "0.0.0.$REVISION_NUMER";
 
 # Global variables
@@ -971,7 +972,7 @@ sub get_local_user_keys() {
 #         1 if the key could not be exported.\n
 #         2 if the key could not be imported.
 #
-sub import_key_from_user_gnupghome() {
+sub import_key_from_user_gnupghome($$) {
     my $err;
     my ($asciikey, $dst_gpghome) = @_;
 
@@ -1001,7 +1002,7 @@ sub import_key_from_user_gnupghome() {
 # @return 0 if successful\n
 #         1 if an error occured.
 #
-sub import_key_files() {
+sub import_key_files($$) {
     my $err;
     my ($keyfile, $dst_gpghome) = @_;
 
@@ -1038,21 +1039,15 @@ 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)) {
+        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);
+        import_key_files($keyfile, $GNUPGHOME);
     }
 
     return 0;
@@ -1131,7 +1126,7 @@ for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argume
 #################
 for my $keyid (@{$CONFIG{'keyid'}}) {
     info("Importing key $keyid from your normal GnuPGHome.");
-    if (&import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
+    if (import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
         mywarn("Key $keyid not found.");
     }
 }
@@ -1215,7 +1210,7 @@ if ($CONFIG{'ask-sign'} && ! $CONFIG{'no-sign'}) {
 }
        
 unless ($CONFIG{'no-sign'}) {
-       my @local_user = &get_local_user_keys();
+       my @local_user = get_local_user_keys();
 
        info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
        for my $keyid (@keyids_ok) {