[Pgp-tools-commit] r478 - in trunk: caff debian

[Peter Palfrader]

Author: weasel
Date: 2010-07-31 11:36:10 +0000 (Sat, 31 Jul 2010)
New Revision: 478

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
caff: refactor copying of command line options into global config variable

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2010-07-31 11:36:03 UTC (rev 477)
+++ trunk/caff/caff	2010-07-31 11:36:10 UTC (rev 478)
@@ -1096,15 +1096,9 @@
 };
 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' ) ) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-31 11:36:03 UTC (rev 477)
+++ trunk/debian/changelog	2010-07-31 11:36:10 UTC (rev 478)
@@ -34,8 +34,9 @@
       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 at debian.org>  Sat, 31 Jul 2010 13:30:54 +0200
+ -- Peter Palfrader <weasel at debian.org>  Sat, 31 Jul 2010 13:32:57 +0200
 
 signing-party (1.1.3-1) unstable; urgency=low