diff options
| author | Peter Palfrader <peter@palfrader.org> | 2003-10-17 23:49:36 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2003-10-17 23:49:36 +0000 |
| commit | 11d9e9c1115c067293a794dcf0a007422ab7ecf5 (patch) | |
| tree | ac812d8b6d032d429f88fb5dec31d3faf3e679f5 /Echolot | |
| parent | e6fb9382199e016bd6487f5ea21c3496904933c6 (diff) | |
Fix bug introduced by ignore-testing.
Diffstat (limited to 'Echolot')
| -rw-r--r-- | Echolot/Stats.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm index c4d9215..5773de0 100644 --- a/Echolot/Stats.pm +++ b/Echolot/Stats.pm @@ -1,7 +1,7 @@ package Echolot::Stats; # (c) 2002 Peter Palfrader <peter@palfrader.org> -# $Id: Stats.pm,v 1.60 2003/09/02 10:11:43 weasel Exp $ +# $Id: Stats.pm,v 1.61 2003/10/17 23:49:36 weasel Exp $ # =pod @@ -471,7 +471,7 @@ sub build_rems($) { 'caps' => Echolot::Globals::get()->{'storage'}->get_capabilities($addr), 'address' => $addr, }; - $rem->{'list-it'} = $remailer->{'showit'} && $rem->{'caps'} !~ m/\btesting\b/i; + $rem->{'list-it'} = $remailer->{'showit'} && defined $rem->{'caps'} && ($rem->{'caps'} !~ m/\btesting\b/i); $rem->{'latency'} = $rem->{'stats'}->{'avr_latency'}; # for sorting purposes only $rem->{'latency'} = 9999 unless defined $rem->{'latency'}; @@ -801,7 +801,8 @@ sub build_mixring() { }; }; - $key{'list-it'} = $remailer->{'list-it'}; + my $caps = Echolot::Globals::get()->{'storage'}->get_capabilities($addr); + $key{'list-it'} = $remailer->{'showit'} && defined $caps && ($caps !~ m/\btesting\b/i); if ( defined Echolot::Globals::get()->{'storage'}->get_nick($addr) ) { $data->{$key{'summary'}} = \%key; $data->{$key{'summary'}} = \%key; @@ -889,7 +890,8 @@ sub build_pgpring_type($$$$) { } elsif ($count_imported < 1) { Echolot::Log::info("GnuPG status '$status' didn't indicate key for '$addr' was imported correctly. Ignoring."); }; - $keyids->{$final_keyid} = $remailer->{'list-it'}; + my $caps = Echolot::Globals::get()->{'storage'}->get_capabilities($addr); + $keyids->{$final_keyid} = $remailer->{'showit'} && defined $caps && ($caps !~ m/\btesting\b/i); }; }; |