svn commit: r584896 - /spamassassin/trunk/build/mkrules Author: dos
Date: Mon Oct 15 13:22:21 2007
New Revision: 584896

URL: http://svn.apache.org/viewvc?rev=584896&view=rev
Log:
allow mkrules to use scores that were generated (based on nightly mass-checks) for the sandbox rules

Modified:
    spamassassin/trunk/build/mkrules

Modified: spamassassin/trunk/build/mkrules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkrules?rev=584896&r1=584895&r2=584896&view=diff
==============================================================================
--- spamassassin/trunk/build/mkrules (original)
+++ spamassassin/trunk/build/mkrules Mon Oct 15 13:22:21 2007
@@ -420,13 +420,13 @@
       my $origname = $name;
       if ($issandbox) {
         $name = sandbox_rule_name_avoid_collisions($name, $f);
+        # comment "score" lines for sandbox rules (bug 5558)
+        # if the scores were found in the sandbox and not in, say, 'scores'
+        if ($type eq 'score' && $rules->{$name}->{issandbox}) {
+          $orig =~ s/^/#/g;
+        }
       }
-      # non-sandbox rules always use the same name
-
-      # comment "score" lines for sandbox rules (bug 5558)
-      if ($type eq 'score' && $rules->{$name}->{issandbox}) {
-        $orig =~ s/^/#/g;
-      }
+      # non-sandbox rules always use the same name and get to use their scores
 
       if (!$rules->{$name}) { $rules->{$name} = rule_entry_create(); }
       $rules->{$name}->{issandbox} = $issandbox;


