From a98d318d4a212079a507864de1cc19c4eee5940b Mon Sep 17 00:00:00 2001 From: weasel Date: Sat, 31 Jul 2010 11:35:57 +0000 Subject: [PATCH] caff: Make importing of keys to be signed from the normal gpg optional (--keys-from-gnupg) git-svn-id: svn://svn.debian.org/pgp-tools/trunk@476 b513b33f-fedd-0310-b452-c3deb5f4c849 --- caff/caff | 17 +++++++++++++---- debian/changelog | 4 +++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/caff/caff b/caff/caff index 9a636cb..11655a4 100755 --- a/caff/caff +++ b/caff/caff @@ -90,6 +90,10 @@ configuration file. Import keys from file. Can be supplied more than once. +=item B<--keys-from-gnupg> I + +Try to import keys from your standard GnuPG keyrings. + =back =head1 FILES @@ -1039,11 +1043,13 @@ 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 - foreach my $keyid (@KEYIDS) { - if (!import_key_from_user_gnupghome($keyid, $GNUPGHOME)) { - info("Key $keyid imported from your normal GnuPGHOME."); + if ($CONFIG{'keys-from-gnupg'}) { + foreach my $keyid (@KEYIDS) { + if (!import_key_from_user_gnupghome($keyid, $GNUPGHOME)) { + info("Key $keyid imported from your normal GnuPGHOME."); + } } - } + }; # Import user specified key files foreach my $keyfile (@{$CONFIG{'key-files'}}) { @@ -1077,6 +1083,7 @@ if (!GetOptions ( '-S' => \$params->{'no-sign'}, '--no-sign' => \$params->{'no-sign'}, '--key-file=s@' => \$params->{'key-files'}, + '--keys-from-gnupg' => \$params->{'keys-from-gnupg'}, )) { usage(\*STDERR, 1); }; @@ -1096,6 +1103,8 @@ $CONFIG{'no-sign'} = $params->{'no-sign'} if defined $params->{'no-sign' $CONFIG{'no-mail'} = $params->{'no-mail'} if defined $params->{'no-mail'}; $CONFIG{'mail'} = $params->{'mail'} if defined $params->{'mail'}; +$CONFIG{'keys-from-gnupg'} = $params->{'keys-from-gnupg'} if defined $params->{'keys-from-gnupg'}; + # If old 'no-mail' parameter, or if the 'mail' parameter is set to 'no' if ( defined $CONFIG{'no-mail'} || ( defined $CONFIG{'mail'} && $CONFIG{'mail'} eq 'no' ) ) { diff --git a/debian/changelog b/debian/changelog index 31b8ed7..9e40917 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,8 +32,10 @@ signing-party (1.1.4-1) UNRELEASED; urgency=low 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. + + Make importing of keys to be signed from the normal gpg optional + (--keys-from-gnupg). - -- Peter Palfrader Sat, 31 Jul 2010 13:18:38 +0200 + -- Peter Palfrader Sat, 31 Jul 2010 13:30:54 +0200 signing-party (1.1.3-1) unstable; urgency=low -- 2.39.5