From 7d788514693cfc5c94bf9c4306ff9cc082e96330 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 22 Oct 2014 21:00:59 +0200
Subject: Work with newer GnuPG::Interface versions again

Newer GnuPG::Interface versions are more picky when it comes to command
and command_args.  Previously, they would accept things in any order and
would not care which of the two arrays had which.  Now, command_args is
really limited to have arguments for the command listed in command.  Any
options go with, and in front of, the command.
---
 Echolot/Stats.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Echolot/Stats.pm')

diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm
index 2ee2527..a1f0b75 100644
--- a/Echolot/Stats.pm
+++ b/Echolot/Stats.pm
@@ -876,8 +876,8 @@ sub build_pgpring_type($$$$) {
 		if ( defined Echolot::Globals::get()->{'storage'}->get_nick($addr) ) {
 			my ( $stdin_fh, $stdout_fh, $stderr_fh, $status_fh, $handles ) = Echolot::Tools::make_gpg_fds();
 			my $pid = $GnuPG->wrap_call(
-				commands     => [ '--import' ],
-				command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --fast-list-mode --keyring}, $keyring, '--', '-' ],
+				commands     => [qw{--no-options --no-secmem-warning --no-default-keyring --fast-list-mode --keyring}, $keyring, '--import'],
+				command_args => ['--', '-'],
 				handles      => $handles );
 			my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg($key{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
 			waitpid $pid, 0;
@@ -904,8 +904,8 @@ sub build_pgpring_export($$$$) {
 
 	my ( $stdin_fh, $stdout_fh, $stderr_fh, $status_fh, $handles ) = Echolot::Tools::make_gpg_fds();
 	my $pid = $GnuPG->wrap_call(
-		commands     => [ '--export' ],
-		command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --keyring}, $keyring, @$keyids ],
+		commands     => [qw{--no-options --no-secmem-warning --no-default-keyring --keyring}, $keyring, '--export'],
+		command_args => ['--', @$keyids ],
 		handles      => $handles );
 	my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
 	waitpid $pid, 0;
-- 
cgit v1.2.3