[Pgp-tools-commit] r760 - in trunk: caff debian

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-01-21 00:15:43 +0000 (Wed, 21 Jan 2015)
New Revision: 760

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
Don't redirect gpg's STDERR when listing the keys.

As it makes gpg croak on OSX when GPG_TTY is not set.  Patch from Ewen
McNeill.  Closes: #775702

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2015-01-13 21:36:16 UTC (rev 759)
+++ trunk/caff/caff	2015-01-21 00:15:43 UTC (rev 760)
@@ -1147,7 +1147,7 @@
 		'homedir' => $GNUPGHOME,
 		'extra_args' => [ qw{ --no-auto-check-trustdb --fingerprint --with-colons } ] );
 
-	my $handles = make_gpg_fds( stdin => $NULL, stdout => undef, stderr => $NULL );
+	my $handles = make_gpg_fds( stdin => $NULL, stdout => undef, stderr => \*STDERR );
 	my $pid = $gpg->list_secret_keys( handles => $handles );
 
 	my $stdout = $handles->{stdout};
@@ -1479,7 +1479,7 @@
 		'always_trust' => 1,
 		'extra_args' => [ qw{ --no-auto-check-trustdb --fingerprint --with-colons --fixed-list-mode } ] );
 
-	my $handles = make_gpg_fds( stdin => $NULL, stdout => undef, stderr => $NULL );
+	my $handles = make_gpg_fds( stdin => $NULL, stdout => undef, stderr => \*STDERR );
 	# process the keys one by one so we can detect collisions
 	my $pid = $gpg->list_public_keys( handles => $handles, command_args => [$keyid] );
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-01-13 21:36:16 UTC (rev 759)
+++ trunk/debian/changelog	2015-01-21 00:15:43 UTC (rev 760)
@@ -6,6 +6,9 @@
       is to be symlinked into ~/.caff/gnupghome.  Symlinks are automatically
       created if ~/.caff/gnupghome doesn't contain a secret keyring or
       directory.  (Closes: #771857)
+    + Don't redirect gpg's STDERR when listing the keys, as it makes gpg
+      croak on OSX when GPG_TTY is not set.  Patch from Ewen McNeill.
+      (Closes: #775702)
 
  -- Guilhem Moulin <guilhem at guilhem.org>  Sat, 03 Jan 2015 11:36:26 +0100