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

[jm...@apache.org]

Author: jm
Date: Thu Dec 15 18:36:20 2005
New Revision: 357108

URL: http://svn.apache.org/viewcvs?rev=357108&view=rev
Log:
force stuff like descriptions for code-tied rules to always be published to the active set

Modified:
    spamassassin/trunk/build/mkrules

Modified: spamassassin/trunk/build/mkrules
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/mkrules?rev=357108&r1=357107&r2=357108&view=diff
==============================================================================
--- spamassassin/trunk/build/mkrules (original)
+++ spamassassin/trunk/build/mkrules Thu Dec 15 18:36:20 2005
@@ -333,6 +333,9 @@
       $rules->{$name}->{text} .= $current_comments . $orig;
       $rules->{$name}->{srcfile} = $f;
 
+      # note if we found the rule defn or not.  if we did not,
+      # that means the rule was a code-tied rule, which should always
+      # have its descriptions/scores/etc. published in "active".
       if ($type =~ /^
           (?:header|rawbody|body|full|uri|meta|mimeheader)
         $/x)
@@ -510,7 +513,9 @@
 
   # default: "70_sandbox.cf" or "72_active.cf"
   if (!$pubfile) {
-    if ($active_rules->{$name} || $rules->{$name}->{forceactive}) {
+    if ($active_rules->{$name} || $rules->{$name}->{forceactive}
+        || !$rules->{$name}->{found_definition})
+    {
       $pubfile = $opt_out.'/'.$opt_activeout;
     }
     elsif ($rules->{$name}->{issandbox}) {