svn commit: r756143 - in /spamassassin/trunk/lib/Mail: SpamAssassin.pm SpamAssassin/PerMsgStatus.pm

[mm...@apache.org]

Author: mmartinec
Date: Thu Mar 19 19:20:24 2009
New Revision: 756143

URL: http://svn.apache.org/viewvc?rev=756143&view=rev
Log:
PerMsgStatus::got_hit : if $params{score} is defined (i.e.
score is explicitly provided by a caller, even if 0), it takes
precedence to a configured rule score. Previously a caller
of got_hit could not force a 0 score. (it's rather a nitpick)

Add a debug printout of a version of perl, and values of PREFIX,
DEF_RULES_DIR, LOCAL_RULES_DIR, LOCAL_STATE_DIR.

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=756143&r1=756142&r2=756143&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Thu Mar 19 19:20:24 2009
@@ -380,6 +380,8 @@
   $self->{DEF_RULES_DIR}	||= '@@DEF_RULES_DIR@@';
   $self->{LOCAL_RULES_DIR}	||= '@@LOCAL_RULES_DIR@@';
   $self->{LOCAL_STATE_DIR}	||= '@@LOCAL_STATE_DIR@@';
+  dbg("generic: Perl %s, %s", $], join(", ", map { $_ . '=' . $self->{$_} } 
+      qw(PREFIX DEF_RULES_DIR LOCAL_RULES_DIR LOCAL_STATE_DIR)));
 
   $self->{needed_tags} = {};
   { my $ntags = $self->{need_tags};

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=756143&r1=756142&r2=756143&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Thu Mar 19 19:20:24 2009
@@ -2177,7 +2177,8 @@
 sub got_hit {
   my ($self, $rule, $area, %params) = @_;
 
-  my $score = $params{score} || $self->{conf}->{scores}->{$rule};
+  my $score = $params{score};
+  $score = $self->{conf}->{scores}->{$rule}  if !defined $score;
 
   # adding a hit does nothing if we don't have a score -- we probably
   # shouldn't have run it in the first place