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

[Peter Palfrader]

Author: weasel
Date: 2005-07-16 12:42:31 +0000 (Sat, 16 Jul 2005)
New Revision: 130

Modified:
   trunk/caff/caff
Log:
Set --no-auto-check-trustdb --trust-model=always everywhere

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-07-15 17:01:25 UTC (rev 129)
+++ trunk/caff/caff	2005-07-16 12:42:31 UTC (rev 130)
@@ -503,6 +503,7 @@
 	$gpg->call( $CONFIG{'gpg'} );
 	$gpg->options->hash_init(
 		'homedir' => $gnupghome,
+		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always } ],
 		'armor' => 1 );
 	$gpg->options->meta_interactive( 0 );
 	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
@@ -521,7 +522,9 @@
 
 	my $gpg = GnuPG::Interface->new();
 	$gpg->call( $CONFIG{'gpg'} );
-	$gpg->options->hash_init( 'homedir' => $gnupghome );
+	$gpg->options->hash_init(
+		'homedir' => $gnupghome,
+		'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);
@@ -580,7 +583,7 @@
 		my $gpg = GnuPG::Interface->new();
 		$gpg->call( $CONFIG{'gpg'} );
 		$gpg->options->hash_init( 'homedir' => $GNUPGHOME,
-			'extra_args' => '--always-trust',
+			'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always } ],
 			'armor' => 1 );
 		$gpg->options->meta_interactive( 0 );
 		my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
@@ -744,10 +747,9 @@
 	$gpg->call( $CONFIG{'gpg'} );
 	$gpg->options->hash_init(
 		'homedir' => $GNUPGHOME,
-		'extra_args' => '--keyserver='.$CONFIG{'keyserver'} );
+		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode } ] );
 	$gpg->options->meta_interactive( 0 );
 	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
-	$gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fixed-list-mode' ] );
 	my $pid = $gpg->list_public_keys(handles => $handles, command_args => $CONFIG{'keyid'});
 	my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
 	waitpid $pid, 0;
@@ -775,7 +777,7 @@
 	$gpg->call( $CONFIG{'gpg'} );
 	$gpg->options->hash_init(
 		'homedir' => $GNUPGHOME,
-		'extra_args' => '--keyserver='.$CONFIG{'keyserver'} );
+		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always }, '--keyserver='.$CONFIG{'keyserver'} ] );
 	$gpg->options->meta_interactive( 0 );
 	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 	my $pid = $gpg->recv_keys(handles => $handles, command_args => [ @KEYIDS ]);
@@ -835,6 +837,8 @@
 		push @command, '--local-user', $USER if (defined $USER);
 		push @command, "--homedir=$GNUPGHOME";
 		push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
+		push @command, '--no-auto-check-trustdb';
+		push @command, '--trust-model=always';
 		push @command, '--edit', $keyid;
 		push @command, 'sign';
 		push @command, split ' ', $CONFIG{'gpg-sign-args'} || "";
@@ -852,10 +856,11 @@
 	#################
 	my $gpg = GnuPG::Interface->new();
 	$gpg->call( $CONFIG{'gpg'} );
-	$gpg->options->hash_init( 'homedir' => $GNUPGHOME );
+	$gpg->options->hash_init(
+		'homedir' => $GNUPGHOME,
+		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode } ] );
 	$gpg->options->meta_interactive( 0 );
 	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
-	$gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fixed-list-mode' ] );
 	my $pid = $gpg->list_public_keys(handles => $handles, command_args => [ $keyid ]);
 	my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
 	waitpid $pid, 0;
@@ -913,7 +918,7 @@
 		$gpg->call( $CONFIG{'gpg-delsig'} );
 		$gpg->options->hash_init(
 			'homedir' => $tempdir,
-			'extra_args' => [ '--with-colons', '--fixed-list-mode', '--command-fd=0', '--no-tty' ] );
+			'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode --command-fd=0 --no-tty } ] );
 		($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 		$pid = $gpg->wrap_call(
 			commands     => [ '--edit' ],