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

[jm...@apache.org]

Author: jm
Date: Wed Jul  4 06:09:02 2007
New Revision: 553198

URL: http://svn.apache.org/viewvc?view=rev&rev=553198
Log:
bug 5545: 3.3.x updates now require an explicit 'tflags publish' for rules in the rulesrc sandboxes to be published in updates

Modified:
    spamassassin/trunk/build/mkupdates/listpromotable

Modified: spamassassin/trunk/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/listpromotable?view=diff&rev=553198&r1=553197&r2=553198
==============================================================================
--- spamassassin/trunk/build/mkupdates/listpromotable (original)
+++ spamassassin/trunk/build/mkupdates/listpromotable Wed Jul  4 06:09:02 2007
@@ -179,19 +179,23 @@
   next unless ($mailsa->{conf}->{descriptions}->{$name}
         || $mailsa->{conf}->{scores}->{$name});
 
-  # "nopublish" tflags
+  # we now require "publish" tflags (bug 5545)
   my $tfs = $mailsa->{conf}->{tflags}->{$name};
-  if ($tfs) {
-    next if ($tfs =~ /\bnopublish\b/);
+  next unless $tfs;
 
-    # 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/) {
-      $notes = "tflags ".$1;
-      goto publish;
-    }
+  # not if there's "nopublish"
+  next if ($tfs =~ /\bnopublish\b/);
+
+  # and not if there is no "publish" tflag
+  next unless ($tfs =~ /\bpublish\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(userconf|learn|net)\b/) {
+    $notes = "tflags ".$1;
+    goto publish;
   }
 
   # ignore rules that are not marked as promotable