svn commit: r416348 - in /spamassassin/trunk: build/mkrules lib/Mail/SpamAssassin/Conf/Parser.pm lib/Mail/SpamAssassin/PerMsgStatus.pm

[jm...@apache.org]

Author: jm
Date: Thu Jun 22 05:26:48 2006
New Revision: 416348

URL: http://svn.apache.org/viewvc?rev=416348&view=rev
Log:
bug 4962: avoid odd 'uninit value' warnings about scores during build/mkrules lint checking

Modified:
    spamassassin/trunk/build/mkrules
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/trunk/build/mkrules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkrules?rev=416348&r1=416347&r2=416348&view=diff
==============================================================================
--- spamassassin/trunk/build/mkrules (original)
+++ spamassassin/trunk/build/mkrules Thu Jun 22 05:26:48 2006
@@ -162,6 +162,7 @@
 
 sub lint_rule_text {
   my ($text) = @_;
+
   my $mailsa = Mail::SpamAssassin->new({
       rules_filename => "./rules",
       # debug => 1,
@@ -185,6 +186,7 @@
   };
 
   $mailsa->lint_rules();
+  $mailsa->finish();
   return $errors;       # 0 means good
 }
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=416348&r1=416347&r2=416348&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Thu Jun 22 05:26:48 2006
@@ -649,6 +649,8 @@
   my ($self) = @_;
   my $conf = $self->{conf};
 
+  dbg("conf: finish parsing");
+
   while (my ($name, $text) = each %{$conf->{tests}}) {
     my $type = $conf->{test_types}->{$name};
     my $priority = $conf->{priority}->{$name} || 0;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=416348&r1=416347&r2=416348&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Thu Jun 22 05:26:48 2006
@@ -2827,6 +2827,12 @@
     # ignore meta-match sub-rules.
     if ($rule =~ /^__/) { push(@{$self->{subtest_names_hit}}, $rule); return; }
 
+    # this should not happen; warn about it
+    if (!defined $score) {
+      warn "rules: score undef for rule '$rule' in '$area' '$desc'";
+      return;
+    }
+
     # Add the rule hit to the score
     $self->{score} += $score;