[Pgp-tools-commit] r469 - trunk/caff

[Peter Palfrader]

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

Modified:
   trunk/caff/caff
Log:
caff: brace-style fixes

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2010-07-05 21:33:02 UTC (rev 468)
+++ trunk/caff/caff	2010-07-31 11:34:36 UTC (rev 469)
@@ -916,8 +916,7 @@
 # @return an array containing the local user keys\n
 #         (undef) if no valid key has been found
 #
-sub get_local_user_keys()
-{
+sub get_local_user_keys() {
 	my @local_user = ();
 	my @key_list;
 	
@@ -972,28 +971,21 @@
 #         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) = @_;
 
     trace("Exporting key $asciikey from your normal GnuPGHOME.");
     my $key = export_key(undef, $asciikey);
-    if (defined $key && $key ne '')
-    {
+    if (defined $key && $key ne '') {
         trace("Importing key $asciikey into $GNUPGHOME.");
-        if (import_key($GNUPGHOME, $key))
-        {
+        if (import_key($GNUPGHOME, $key)) {
             $err = 0;
-        }
-        else
-        {
+        } else {
             warn("Could not import $asciikey into caff's gnupghome.");
             $err = 2;
         }
-    }
-    else
-    {
+    } else {
         $err = 1;
     }
 
@@ -1009,8 +1001,7 @@
 # @return 0 if successful\n
 #         1 if an error occured.
 #
-sub import_key_files()
-{
+sub import_key_files() {
     my $err;
     my ($keyfile, $dst_gpghome) = @_;
 
@@ -1026,13 +1017,10 @@
     info("Importing keys from file $keyfile");
     waitpid $pid, 0;
 
-    if ($status !~ /^\[GNUPG:\] IMPORT_OK/m)
-    {
+    if ($status !~ /^\[GNUPG:\] IMPORT_OK/m) {
         warn $stderr;
         $err = 1;
-    }
-    else
-    {
+    } else {
         $err = 0;
     }
 
@@ -1047,15 +1035,12 @@
 # and in the key files specified by the user if not all of the keys have been
 # found.
 #
-sub import_keys_to_sign()
-{
+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))
-        {
+    foreach my $keyid (@KEYIDS) {
+        if (!&import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
             info("Key $keyid imported from your normal GnuPGHOME.");
             $imported_keys++;
         }
@@ -1066,8 +1051,7 @@
     return 1 if ($imported_keys == scalar (@KEYIDS));
 
     # Import user specified key files
-    foreach my $keyfile (@{$CONFIG{'key-files'}})
-    {
+    foreach my $keyfile (@{$CONFIG{'key-files'}}) {
         &import_key_files($keyfile, $GNUPGHOME);
     }
 
@@ -1145,11 +1129,9 @@
 #################
 # import own keys
 #################
-for my $keyid (@{$CONFIG{'keyid'}})
-{
+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.");
     }
 }
@@ -1232,8 +1214,7 @@
 	$CONFIG{'no-sign'} = ! ask("Continue with signing?", 1);
 }
 	
-unless ($CONFIG{'no-sign'})
-{
+unless ($CONFIG{'no-sign'}) {
 	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");