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

[Peter Palfrader]

Author: weasel
Date: 2010-07-31 11:35:46 +0000 (Sat, 31 Jul 2010)
New Revision: 475

Modified:
   trunk/caff/caff
Log:
caff: fix indentation whitespace of new functions to match what is used elsewhere

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2010-07-31 11:35:35 UTC (rev 474)
+++ trunk/caff/caff	2010-07-31 11:35:46 UTC (rev 475)
@@ -973,24 +973,24 @@
 #         2 if the key could not be imported.
 #
 sub import_key_from_user_gnupghome($$) {
-    my $err;
-    my ($asciikey, $dst_gpghome) = @_;
+	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 '') {
-        trace("Importing key $asciikey into $GNUPGHOME.");
-        if (import_key($GNUPGHOME, $key)) {
-            $err = 0;
-        } else {
-            warn("Could not import $asciikey into caff's gnupghome.");
-            $err = 2;
-        }
-    } else {
-        $err = 1;
-    }
+	trace("Exporting key $asciikey from your normal GnuPGHOME.");
+	my $key = export_key(undef, $asciikey);
+	if (defined $key && $key ne '') {
+		trace("Importing key $asciikey into $GNUPGHOME.");
+		if (import_key($GNUPGHOME, $key)) {
+			$err = 0;
+		} else {
+			warn("Could not import $asciikey into caff's gnupghome.");
+			$err = 2;
+		}
+	} else {
+		$err = 1;
+	}
 
-    return $err;
+	return $err;
 }
 
 ##
@@ -1003,29 +1003,29 @@
 #         1 if an error occured.
 #
 sub import_key_files($$) {
-    my $err;
-    my ($keyfile, $dst_gpghome) = @_;
+	my $err;
+	my ($keyfile, $dst_gpghome) = @_;
 
-    my $gpg = GnuPG::Interface->new();
-    $gpg->call( $CONFIG{'gpg'} );
-    $gpg->options->hash_init(
-        'homedir' => $dst_gpghome,
-        'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always } ] );
-    $gpg->options->meta_interactive( 0 );
-    my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
-    my $pid = $gpg->import_keys(handles => $handles, command_args => $keyfile);
-    my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
-    info("Importing keys from file $keyfile");
-    waitpid $pid, 0;
+	my $gpg = GnuPG::Interface->new();
+	$gpg->call( $CONFIG{'gpg'} );
+	$gpg->options->hash_init(
+		'homedir' => $dst_gpghome,
+		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always } ] );
+	$gpg->options->meta_interactive( 0 );
+	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
+	my $pid = $gpg->import_keys(handles => $handles, command_args => $keyfile);
+	my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
+	info("Importing keys from file $keyfile");
+	waitpid $pid, 0;
 
-    if ($status !~ /^\[GNUPG:\] IMPORT_OK/m) {
-        warn $stderr;
-        $err = 1;
-    } else {
-        $err = 0;
-    }
+	if ($status !~ /^\[GNUPG:\] IMPORT_OK/m) {
+		warn $stderr;
+		$err = 1;
+	} else {
+		$err = 0;
+	}
 
-    return $err;
+	return $err;
 }
 
 ##
@@ -1037,20 +1037,20 @@
 # found.
 #
 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.");
-        }
-    }
+	# 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.");
+		}
+	}
 
-    # Import user specified key files
-    foreach my $keyfile (@{$CONFIG{'key-files'}}) {
-        import_key_files($keyfile, $GNUPGHOME);
-    }
+	# Import user specified key files
+	foreach my $keyfile (@{$CONFIG{'key-files'}}) {
+		import_key_files($keyfile, $GNUPGHOME);
+	}
 
-    return 0;
+	return 0;
 }
 
 ###################
@@ -1125,10 +1125,10 @@
 # import own keys
 #################
 for my $keyid (@{$CONFIG{'keyid'}}) {
-    info("Importing key $keyid from your normal GnuPGHome.");
-    if (import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
-        mywarn("Key $keyid not found.");
-    }
+	info("Importing key $keyid from your normal GnuPGHome.");
+	if (import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
+		mywarn("Key $keyid not found.");
+	}
 }
 
 &import_keys_to_sign();