[Pgp-tools-commit] r72 - trunk/gpgsigs

[Christoph Berg]

Author: myon-guest
Date: 2005-06-20 16:51:24 +0000 (Mon, 20 Jun 2005)
New Revision: 72

Modified:
   trunk/gpgsigs/gpgsigs
Log:
* replace md5sums partly given in template
* fix "(  )" output for more than one local key
* use qq$$ to get rid of $$ in version output


Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2005-06-20 08:46:49 UTC (rev 71)
+++ trunk/gpgsigs/gpgsigs	2005-06-20 16:51:24 UTC (rev 72)
@@ -18,7 +18,7 @@
 #   * better charset conversion
 #   * pod documentation
 
-my $VERSION = '$Rev$';
+my $VERSION = qq$Rev$;
 
 use strict;
 use warnings;
@@ -32,7 +32,7 @@
 	my ($fd) = @_;
 
 	print $fd <<EOF;
-gpgsigs $VERSION - http://pgp-tools.alioth.debian.org/
+gpgsigs $VERSION- http://pgp-tools.alioth.debian.org/
   (c) 2004 Uli Martens <uli\@youam.net>
   (c) 2004, 2005 Peter Palfrader <peter\@palfrader.org>
   (c) 2004, 2005 Christoph Berg <cb\@df7cb.de>
@@ -225,7 +225,7 @@
 	my ($key, $uid) = @_;
 	if (! defined $sigs->{$key}->{$uid}) {
 		warn "uid '$uid' not found on key $key\n";
-		return '(_)';
+		return '(' . (' ' x @mykeys) . ')';
 	}
 	my $r = '(';
 	foreach my $mykey (@mykeys) {
@@ -241,10 +241,10 @@
 while (<TXT>) {
 	$_ = myfromrecode($_);
 	if (/^MD5 Checksum:/ && defined $MD5) {
-		s/_[_ ]+_/$MD5/;
+		s/[_[:xdigit:]][_ [:xdigit:]]+_/$MD5/;
 	}
 	if (/^SHA1 Checksum:/ && defined $SHA1) {
-		s/_[_ ]+_/$SHA1/;
+		s/[_[:xdigit:]][_ [:xdigit:]]+_/$SHA1/;
 	}
 	if ( m/^pub  +(?:\d+)[DR]\/([0-9A-F]{8}) [0-9]{4}-[0-9]{2}-[0-9]{2} *(.*)/ ) {
 		$key = $1;