[Pgp-tools-commit] r219 - in trunk: debian gpg-key2ps

[Christoph Berg]

Author: myon-guest
Date: 2005-08-21 17:28:13 +0000 (Sun, 21 Aug 2005)
New Revision: 219

Modified:
   trunk/debian/changelog
   trunk/gpg-key2ps/gpg-key2ps
Log:
handle revoked uids in perl to get linecount right

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-08-19 15:11:01 UTC (rev 218)
+++ trunk/debian/changelog	2005-08-21 17:28:13 UTC (rev 219)
@@ -1,7 +1,8 @@
 signing-party (0.4.2-2) UNRELEASED; urgency=low
 
   [ Christoph Berg ]
-  *
+  * gpg-key2ps:
+     + handle revoked uids in perl to get linecount right (Closes: #320785).
 
   [ Peter Palfrader ]
   * Install caff's pgp-fixkey.

Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps	2005-08-19 15:11:01 UTC (rev 218)
+++ trunk/gpg-key2ps/gpg-key2ps	2005-08-21 17:28:13 UTC (rev 219)
@@ -165,8 +165,6 @@
 	print "	uid\n";
 	print "	0 setgray\n";
 	print "} def\n";
-} elsif ( $revokestyle eq "hide" ) {
-	print "/revuid {} def\n";
 } elsif ( $revokestyle eq "note" ) {
 	print "/revuid {\n";
 	print "	50 y moveto (uid) show\n";
@@ -223,7 +221,9 @@
 	# user ids
 	s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/	($1) uid/;
 	# revoked user id
-	s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/	($1) revuid/;
+	if (s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/	($1) revuid/) {
+		next if $revokestyle eq "hide";
+	}
 	# subkey
 	s/^sub:[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	($4) ($3) $2 ($1) sbk/;
 	$numlines++;
@@ -237,6 +237,8 @@
 	exit 1;
 }
 
+print STDERR "numlines $numlines\n";
+
 # output the remaining postscript
 print <<EOF;
 } def