svn commit: r1814293 - /spamassassin/trunk/masses/rule-update-score-gen/merge-scoresets

[da...@apache.org]

Author: davej
Date: Sat Nov  4 14:42:30 2017
New Revision: 1814293

URL: http://svn.apache.org/viewvc?rev=1814293&view=rev
Log:
Missed updated rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets when rebuilding the new sa-vm1 scripts.  Found by Merijn van den Kroonenberg.  This bug was causing some scores in 72_scores.cf to come and go giving them the default score of 1.0.  This script was most likely running on the old SA server before it crashed/went away but no way to tell for sure.

Modified:
    spamassassin/trunk/masses/rule-update-score-gen/merge-scoresets

Modified: spamassassin/trunk/masses/rule-update-score-gen/merge-scoresets
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-update-score-gen/merge-scoresets?rev=1814293&r1=1814292&r2=1814293&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-update-score-gen/merge-scoresets (original)
+++ spamassassin/trunk/masses/rule-update-score-gen/merge-scoresets Sat Nov  4 14:42:30 2017
@@ -34,8 +34,8 @@ $active_rule_set = $ARGV[0] if (defined
 if (defined $active_rule_set) {
   open (SCORES, "scores-set$active_rule_set") or die "Cannot open scores-set$active_rule_set: $!";
   while(<SCORES>) {
-    next unless /^score (\S+)\s+(-?[\d.]+)$/;
-    @{$rules{$1}} = ('0.000', '0.000' ,'0.000', '0.000');
+    next unless /^score (\S+)\s+(-?[\d.]+)\b/;
+    @{$rules{$1}} = ('0.001', '0.001' ,'0.001', '0.001');
     $rules{$1}[$active_rule_set] = $2;
   }
   close SCORES;
@@ -45,9 +45,9 @@ for (my $i = 0; $i < 4; $i++) {
   next if (defined $active_rule_set && $i == $active_rule_set);
   open (SCORES, "scores-set$i") or die "Cannot open scores-set$i: $!";
   while(<SCORES>) {
-    next unless /^score (\S+)\s+(-?[\d.]+)$/;
+    next unless /^score (\S+)\s+(-?[\d.]+)\b/;
     next if (defined $active_rule_set && !exists $rules{$1});
-    @{$rules{$1}} = ('0.000', '0.000' ,'0.000', '0.000') unless exists $rules{$1};
+    @{$rules{$1}} = ('0.001', '0.001' ,'0.001', '0.001') unless exists $rules{$1};
     $rules{$1}[$i] = $2;
   }
   close SCORES;
@@ -56,7 +56,7 @@ for (my $i = 0; $i < 4; $i++) {
 open (SCORES, ">scores") or die "Cannot open scores: $!";
   foreach my $rule (sort(keys %rules)) {
     my $line = "score $rule ";
-    for (my $i = 0; $i < 30 - length $rule; $i++) {
+    for (my $i = 0; $i < 37 - length $rule; $i++) {
       $line .= ' ';
     }
     $line .= join(' ', @{$rules{$rule}})."\n";