Mailing List Archive

Author: dos
Date: Tue Oct 3 16:39:20 2006
New Revision: 452676

URL: http://svn.apache.org/viewvc?view=rev&rev=452676
Log:
bug 5040: if in no-net scoreset, don't warn about net rules being zero-score dependencies of meta rules

Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm?view=diff&rev=452676&r1=452675&r2=452676
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm Tue Oct 3 16:39:20 2006
@@ -2487,7 +2487,19 @@
info("rules: meta test $rulename has undefined dependency '$token'");
}
elsif ($self->{conf}->{scores}->{$token} == 0) {
- info("rules: meta test $rulename has dependency '$token' with a zero score");
+ my $conf = $self->{conf};
+ my $dowarn = 1;
+
+ # there are some cases where this is expected; don't warn
+ # in those cases.
+ if ((($self->{conf}->get_score_set()) & 1) == 0 &&
+ $conf->{tflags}->{$token} &&
+ $conf->{tflags}->{$token} =~ /\bnet\b/)
+ {
+ $dowarn = 0; # bug 5040: net rules in a non-net scoreset
+ }
+
+ $dowarn and info("rules: meta test $rulename has dependency '$token' with a zero score");
}

# If the token is another meta rule, add it as a dependency