From: myon <myon@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Wed, 16 Aug 2006 11:44:38 +0000 (+0000)
Subject: * gpg-key2ps: add --list-key to gpg call (works around #382794).
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=135487f47117bae469f6088c0ceb75db951f402e;p=pgp-tools.git

* gpg-key2ps: add --list-key to gpg call (works around #382794).

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@296 b513b33f-fedd-0310-b452-c3deb5f4c849
---

diff --git a/debian/changelog b/debian/changelog
index c8c2a92..a5e63db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 signing-party (0.4.7-2) unreleased; urgency=low
 
   * gpglist: do not die with with-fingerprint (Closes: #382019).
+  * gpg-key2ps: add --list-key to gpg call (works around #382794).
 
  -- Christoph Berg <myon@debian.org>  Tue, 15 Aug 2006 17:48:03 +0200
 
diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index 05c2bf5..302381b 100755
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -3,7 +3,7 @@
 # gpg-key2ps: convert a PGP/GnuPG key into paper slips.
 # Copyright (C) 2001-2005  Simon Richter
 # Copyright (C) 2005-2006  Thijs Kinkhorst
-# Copyright (C) 2005  Christoph Berg <cb@df7cb.de>
+# Copyright (C) 2005-2006  Christoph Berg <cb@df7cb.de>
 # Licenced under the GNU General Public License,
 # version 2 or later.
 #
@@ -19,7 +19,7 @@ my $creationdate = scalar(localtime);
 
 sub version($) {
 	my $fd = shift;
-	print $fd "gpg-key2ps $version - (c) 2001-2005 Simon Richter, Thijs Kinkhorst, Christoph Berg\n";
+	print $fd "gpg-key2ps $version - (c) 2001-2006 Simon Richter, Thijs Kinkhorst, Christoph Berg\n";
 }
 
 sub usage($$) {
@@ -92,7 +92,8 @@ if ( `which paperconf` && $? == 0 ) {
 
 # open a gpg process we'll be reading from below
 map { s/'/'\\''/g; } @ARGV; # quote single quotes
-open(GPG, "gpg --fingerprint --with-colons '". (join "' '", @ARGV) ."' |");
+# --list-key due to #382794
+open(GPG, "gpg --list-key --with-fingerprint --with-colons '". (join "' '", @ARGV) ."' |");
 
 sub start_postscript {
 # start the PostScript output