[Bps-public-commit] GnuPG-Interface branch, work-with-both-gnupgs, updated. 0.52-49-gd8f7172

[Aaron Trevena]

The branch, work-with-both-gnupgs has been updated
       via  d8f7172a0c3b5177156d07c04c5c1cd407485831 (commit)
       via  a57a0322209cc273b6807d47110c5088c865baef (commit)
      from  4cf80811f5acb687334251e28dbad9917ab98ed5 (commit)

Summary of changes:
 lib/GnuPG/Options.pm | 4 ++++
 t/000_setup.t        | 2 +-
 t/decrypt.t          | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit a57a0322209cc273b6807d47110c5088c865baef
Author: Aaron Trevena <aaron at aarontrevena.co.uk>
Date:   Wed May 6 19:12:48 2020 +0100

    remove env flag for testing with agent if gnugpg 2.2

diff --git a/t/000_setup.t b/t/000_setup.t
index 1659b61..8e3235a 100644
--- a/t/000_setup.t
+++ b/t/000_setup.t
@@ -17,7 +17,7 @@ TEST
 
     copy('test/gpg.conf', $homedir . '/gpg.conf');
 
-    if ($gnupg->cmp_version($gnupg->version, '2.2') >= 0 and $ENV{TEST_USE_GPG_AGENT}) {
+    if ($gnupg->cmp_version($gnupg->version, '2.2') >= 0) {
         my $agentconf = IO::File->new( "> " . $homedir . "/gpg-agent.conf" );
         # Classic gpg can't use loopback pinentry programs like fake-pinentry.pl.
         $agentconf->write(
diff --git a/t/decrypt.t b/t/decrypt.t
index ce8a884..5bb35da 100644
--- a/t/decrypt.t
+++ b/t/decrypt.t
@@ -63,7 +63,7 @@ TEST
 # test without default_passphrase (that is, by using the agent, if ENV flag set)
 TEST
 {
-    return 1 unless ($gnupg->cmp_version($gnupg->version, '2.2') >= 0 and $ENV{TEST_USE_GPG_AGENT});
+    return 1 unless ($gnupg->cmp_version($gnupg->version, '2.2') >= 0);
 
     reset_handles();
 
@@ -86,6 +86,6 @@ TEST
 
 TEST
 {
-    return 1 unless ($gnupg->cmp_version($gnupg->version, '2.2') >= 0 and $ENV{TEST_USE_GPG_AGENT});
+    return 1 unless ($gnupg->cmp_version($gnupg->version, '2.2') >= 0);
     return compare( $texts{alt_plain}->fn(), $texts{temp}->fn() ) == 0;
 };

commit d8f7172a0c3b5177156d07c04c5c1cd407485831
Author: Aaron Trevena <aaron at aarontrevena.co.uk>
Date:   Wed May 6 19:17:28 2020 +0100

    Added --keyring and --no-default-keyring options to GnuPG::Options

diff --git a/lib/GnuPG/Options.pm b/lib/GnuPG/Options.pm
index fc86168..9b94653 100644
--- a/lib/GnuPG/Options.pm
+++ b/lib/GnuPG/Options.pm
@@ -36,6 +36,8 @@ use constant BOOLEANS => qw(
     meta_pgp_2_compatible
     meta_interactive
     ignore_mdc_error
+    keyring
+    no_default_keyring
 );
 
 use constant SCALARS => qw(
@@ -167,6 +169,8 @@ sub get_option_args {
     push @args, '--logger-file', $self->logger_file() if ($self->logger_file());
 
     push @args, '--ignore-mdc-error' if ($self->ignore_mdc_error());
+    push @args, '--keyring' if ( $self->keyring() );
+    push @args, '--no-default-keyring' if ( $self->no_default_keyring() );
 
     return @args;
 }

-----------------------------------------------------------------------