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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-09-13 18:01:28 +0000 (Sat, 13 Sep 2014)
New Revision: 708

Modified:
   trunk/caff/caff
   trunk/caff/pgp-clean
   trunk/caff/pgp-fixkey
Log:
Replace gpg's '--edit' with '--edit-key', which is the documented option.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2014-09-05 09:34:32 UTC (rev 707)
+++ trunk/caff/caff	2014-09-13 18:01:28 UTC (rev 708)
@@ -1487,7 +1487,7 @@
 			push @command, "--homedir=$GNUPGHOME";
 			push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
 			push @command, qw/--no-auto-check-trustdb --trust-model=always/;
-			push @command, '--edit', $keyid;
+			push @command, '--edit-key', $keyid;
 			push @command, 'showphoto' if $CONFIG{'show-photos'};
 			push @command, $CONFIG{'gpg-sign-type'}.'sign';
 			push @command, split ' ', $CONFIG{'gpg-sign-args'} || "";
@@ -1537,10 +1537,10 @@
 			'homedir' => $uiddir,
 			'command_fd' => 0,
 			'always_trust' => 1,
-			'extra_args' => [ qw{ --no-auto-check-trustdb --with-colons --fixed-list-mode --no-tty } ] );
+			'extra_args' => [ qw{ --no-auto-check-trustdb --with-colons --fast-list-mode --fixed-list-mode --no-tty } ] );
 		my $handles = make_gpg_fds( map {$_ => undef} qw/stdin stdout stderr status/ );
 		my $pid = $gpg->wrap_call(
-			commands     => [ '--edit' ],
+			commands     => [ '--edit-key' ],
 			command_args => [ $keyid ],
 			handles      => $handles );
 
@@ -1627,7 +1627,7 @@
 				push @command, '--local-user', $local_user if defined $local_user;
 				push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
 				push @command, qw/--no-auto-check-trustdb --trust-model=always/;
-				push @command, '--edit', $keyid;
+				push @command, '--edit-key', $keyid;
 				push @command, 'showphoto' if $CONFIG{'show-photos'};
 				push @command, 'lsign';
 				push @command, split ' ', $CONFIG{'gpg-sign-args'} || "";
@@ -1670,7 +1670,7 @@
 									, qw{ --no-auto-check-trustdb --no-tty } ] );
 				my $handles = make_gpg_fds( map {$_ => undef} qw/stdin stdout stderr status/ );
 				my $pid = $gpg->wrap_call(
-					commands     => [ '--edit' ],
+					commands     => [ '--edit-key' ],
 					command_args => [ $keyid ],
 					handles      => $handles );
 

Modified: trunk/caff/pgp-clean
===================================================================
--- trunk/caff/pgp-clean	2014-09-05 09:34:32 UTC (rev 707)
+++ trunk/caff/pgp-clean	2014-09-13 18:01:28 UTC (rev 708)
@@ -374,7 +374,7 @@
 		'extra_args' => [ '--with-colons', '--fixed-list-mode', '--command-fd=0', '--no-tty' ] );
 	($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 	$pid = $gpg->wrap_call(
-		commands     => [ '--edit' ],
+		commands     => [ '--edit-key' ],
 		command_args => [ $keyid ],
 		handles      => $handles );
 

Modified: trunk/caff/pgp-fixkey
===================================================================
--- trunk/caff/pgp-fixkey	2014-09-05 09:34:32 UTC (rev 707)
+++ trunk/caff/pgp-fixkey	2014-09-13 18:01:28 UTC (rev 708)
@@ -315,7 +315,7 @@
 		'extra_args' => [ '--with-colons', '--fixed-list-mode', '--command-fd=0', '--no-tty' ] );
 	($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 	$pid = $gpg->wrap_call(
-		commands     => [ '--edit' ],
+		commands     => [ '--edit-key' ],
 		command_args => [ $keyid ],
 		handles      => $handles );