svn commit: r463742 - /spamassassin/trunk/build/mkrules

[jm...@apache.org]

Author: jm
Date: Fri Oct 13 10:24:31 2006
New Revision: 463742

URL: http://svn.apache.org/viewvc?view=rev&rev=463742
Log:
bug 5129: remove 'test' lines from rules/72_active.cf, make sure they always go to sandbox.cf where possible

Modified:
    spamassassin/trunk/build/mkrules

Modified: spamassassin/trunk/build/mkrules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkrules?view=diff&rev=463742&r1=463741&r2=463742
==============================================================================
--- spamassassin/trunk/build/mkrules (original)
+++ spamassassin/trunk/build/mkrules Fri Oct 13 10:24:31 2006
@@ -514,6 +514,14 @@
       /^\s*(\S+)/ and $name = $1;
       $name =~ s/\s+/ /gs;
 
+      my $forceactive = 1;
+
+      # always send 'test' lines to the sandbox
+      if (/^test\s*/) {
+        $issandbox = 1;
+        $forceactive = 0;
+      }
+
       my $cond;
       if ($current_conditional) {
         $name = $current_conditional; $name =~ s/\s+/ /gs;
@@ -529,7 +537,7 @@
       }
       $rules->{$name}->{cond} ||= $cond;
       $rules->{$name}->{issandbox} = $issandbox;
-      $rules->{$name}->{forceactive} = 1;
+      $rules->{$name}->{forceactive} = $forceactive;
       $rules->{$name}->{iscommand} = 1;
 
       # warn "unknown line in rules file '$f', saving to default: $orig";