svn commit: r1085175 - /spamassassin/trunk/build/mkupdates/listpromotable

[kb...@apache.org]

Author: kb
Date: Thu Mar 24 22:48:21 2011
New Revision: 1085175

URL: http://svn.apache.org/viewvc?rev=1085175&view=rev
Log:
Bug 6560, specifically declared #testrules may only be overridden on a
rule-by-rule basis by tflags publish, not tflags net.


Modified:
    spamassassin/trunk/build/mkupdates/listpromotable

Modified: spamassassin/trunk/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/listpromotable?rev=1085175&r1=1085174&r2=1085175&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/listpromotable (original)
+++ spamassassin/trunk/build/mkupdates/listpromotable Thu Mar 24 22:48:21 2011
@@ -209,11 +209,7 @@ foreach my $plistkey (sort keys %{$plist
   if ($tfs) {
     next if ($tfs =~ /\bnopublish\b/);
 
-    # all of these tflags force publication;
-    # include "net", since otherwise this script has to be aware
-    # what day of the week it is for weekly net/non-net mass-checks!
-    # very messy.  TODO?
-    if ($tfs =~ /\b(publish|userconf|learn|net)\b/) {
+    if ($tfs =~ /\bpublish\b/) {
       $notes = "tflags ".$1;
       goto publish;
     }
@@ -224,6 +220,16 @@ foreach my $plistkey (sort keys %{$plist
   # it on a rule-by-rule basis anyway
   next if ($mailsa->{conf}->{testrules}->{$name});
 
+  # bug 6560, unless specifically declared #testrules;
+  # all of these tflags force publication;
+  # include "net", since otherwise this script has to be aware
+  # what day of the week it is for weekly net/non-net mass-checks!
+  # very messy.  TODO?
+  if ($tfs && $tfs =~ /\b(userconf|learn|net)\b/) {
+    $notes = "tflags ".$1;
+    goto publish;
+  }
+
   # ignore rules that are not marked as promotable in ANY of the days.
   # ie a rule must be promotable in all 3, to be listed.  (Also allow
   # rules that weren't in existence in the earlier mass-checks.)