svn commit: r553694 - /spamassassin/branches/3.2/build/mkupdates/listpromotable

[si...@apache.org]

Author: sidney
Date: Thu Jul  5 18:47:14 2007
New Revision: 553694

URL: http://svn.apache.org/viewvc?view=rev&rev=553694
Log:
bug 5545: revert r553327 which I never should have committed, back to previous 'tflags publish' behaviour

Modified:
    spamassassin/branches/3.2/build/mkupdates/listpromotable

Modified: spamassassin/branches/3.2/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.2/build/mkupdates/listpromotable?view=diff&rev=553694&r1=553693&r2=553694
==============================================================================
--- spamassassin/branches/3.2/build/mkupdates/listpromotable (original)
+++ spamassassin/branches/3.2/build/mkupdates/listpromotable Thu Jul  5 18:47:14 2007
@@ -179,23 +179,19 @@
   next unless ($mailsa->{conf}->{descriptions}->{$name}
         || $mailsa->{conf}->{scores}->{$name});
 
-  # we now require "publish" tflags (bug 5545)
+  # "nopublish" tflags
   my $tfs = $mailsa->{conf}->{tflags}->{$name};
-  next unless $tfs;
+  if ($tfs) {
+    next if ($tfs =~ /\bnopublish\b/);
 
-  # 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;
+    # 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;
+    }
   }
 
   # ignore rules that are not marked as promotable