Bug#302693: updated patch

[Thomas Huriaux]

Hi,

Please find attached an updated patch which is better to solve this bug.

I have used the keyring composed of the following keys to test it:
3CC69CD0, 3B76AE3A, C0143D2D, F5D65169 and 08E38BBC
and the following commands:

gpg --keyring testring.gpg --no-default-keyring --list-sigs | sig2dot
gpg --keyring testring.gpg --no-default-keyring --list-sigs debian | sig2dot
gpg --keyring testring.gpg --no-default-keyring --list-sigs debian | sig2dot -a
gpg --keyring testring.gpg --no-default-keyring --list-sigs | sig2dot -a

I hope it helps.

-- 
Thomas Huriaux

--- sig2dot.orig        2005-12-07 13:24:47.000000000 +0100
+++ sig2dot     2005-12-07 13:52:10.000000000 +0100
@@ -147,7 +147,7 @@
   $revokestr = "[revoked"; # this changed from gpg 1.2 -> 1.4
 }
 
-my ($owner, %name, %revlist, %sigstmp, %signedbytmp, @names, %revs);
+my ($owner, %name, %revlist, %sigstmp, %signedbytmp, %idlist, @names, %revs);
 
 while (my $line = <>)
 {
@@ -192,6 +192,7 @@
       {
         $id = (split('/',$id))[1];
         $owner = $id; 
+        $idlist{$id} = 1 if (index($name, $revokestr) < 0);
       } 
 
       # remove comment field
@@ -323,6 +324,7 @@
   if ((not exists $sigcount{$id}) and (not exists $signedbycount{$id}) and not 
$all) {
     next;
   }
+  next if (not defined $idlist{$id});
   if ($color)
   {
     my ($red, $green, $blue) = (0, 1/3, 1/3);

signature.asc
Description: Digital signature