Mailing List Archive

Author: dos
Date: Tue Dec 12 21:24:59 2006
New Revision: 486500

URL: http://svn.apache.org/viewvc?view=rev&rev=486500
Log:
bug 4347: move undefined meta dependency messages from info to dbg to keep them out of the syslog when the standard ruleset is used with some plugins disabled; anyone looking for meta rule debugging info should run test messages through SA with -Drules

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm?view=diff&rev=486500&r1=486499&r2=486500
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm Tue Dec 12 21:24:59 2006
@@ -332,20 +332,17 @@
$meta{$rulename} .= "(\$h->{'$token'} || 0) ";

if (!exists $conf->{scores}->{$token}) {
- info("rules: meta test $rulename has undefined dependency '$token'");
+ dbg("rules: meta test $rulename has undefined dependency '$token'");
}
elsif ($conf->{scores}->{$token} == 0) {
- my $dowarn = 1;
-
+ # bug 5040: net rules in a non-net scoreset
# there are some cases where this is expected; don't warn
# in those cases.
- if ((($conf->get_score_set()) & 1) == 0 &&
+ unless ((($conf->get_score_set()) & 1) == 0 &&
($conf->{tflags}->{$token}||'') =~ /\bnet\b/)
{
- $dowarn = 0; # bug 5040: net rules in a non-net scoreset
+ info("rules: meta test $rulename has dependency '$token' with a zero score");
}
-
- $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