From: weasel <weasel@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Sat, 31 Jul 2010 11:36:10 +0000 (+0000)
Subject: caff: refactor copying of command line options into global config variable
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=61b4491a4a2a9b38d95f9601b54eeef38b762d49;p=pgp-tools.git

caff: refactor copying of command line options into global config variable

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

diff --git a/caff/caff b/caff/caff
index a5d4f4a..992aee6 100755
--- a/caff/caff
+++ b/caff/caff
@@ -1096,15 +1096,9 @@ if ($params->{'version'}) {
 };
 usage(\*STDERR, 1) unless scalar @ARGV >= 1;
 
-$CONFIG{'local-user'}  = $params->{'local-user'}  if defined $params->{'local-user'};
-$CONFIG{'no-download'} = $params->{'no-download'} if defined $params->{'no-download'};
-$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'};
-
+for my $hashkey (qw{local-user no-download no-sign no-mail mail keys-from-gnupg}) {
+	$CONFIG{$hashkey} = $params->{$hashkey}  if defined $params->{$hashkey};
+};
 # 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 9e40917..02fc553 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,9 @@ signing-party (1.1.4-1) UNRELEASED; urgency=low
       new subkeys (for encryption), uids (for signing) or revocations.
     + Make importing of keys to be signed from the normal gpg optional
       (--keys-from-gnupg).
+    + refactor copying of command line options into global config variable.
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 31 Jul 2010 13:30:54 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sat, 31 Jul 2010 13:32:57 +0200
 
 signing-party (1.1.3-1) unstable; urgency=low