svn commit: r416088 - in /spamassassin/trunk/build: automc/run_preflight mkupdates/listpromotable

[jm...@apache.org]

Author: jm
Date: Wed Jun 21 12:40:49 2006
New Revision: 416088

URL: http://svn.apache.org/viewvc?rev=416088&view=rev
Log:
allow all plugins in preflight mass-checks; also, work around preflight failures caused by scores in the sandbox.cf file

Modified:
    spamassassin/trunk/build/automc/run_preflight
    spamassassin/trunk/build/mkupdates/listpromotable

Modified: spamassassin/trunk/build/automc/run_preflight
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/run_preflight?rev=416088&r1=416087&r2=416088&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/run_preflight (original)
+++ spamassassin/trunk/build/automc/run_preflight Wed Jun 21 12:40:49 2006
@@ -34,9 +34,29 @@
 #
 system ("rm -rf tstrules");
 run "mkdir tstrules";
-run "cp ../rules/70_sandbox.cf tstrules";
 run "cp ../rules/*.pm tstrules";
 run "cp plugins/*.* tstrules";
+
+# don't just copy; instead, transcribe while dropping score and describe lines
+# (to avoid '[26260] warn: config: warning: score set for non-existent rule
+# HTML_SHORT_LENGTH').
+## run "cp ../rules/70_sandbox.cf tstrules";
+open IN, "<../rules/70_sandbox.cf" or die "cannot read ../rules/sandbox.cf";
+open OUT, ">tstrules/70_sandbox.cf" or die "cannot write tstrules/70_sandbox.cf";
+
+while (<IN>) {
+  s/^\s+//;
+  next if /^(?:
+    score|
+    describe|
+    lang
+    )/x;
+
+  print OUT;
+}
+
+close IN or die "close failed!";
+close OUT or die "close failed!";
 
 # well, ok just those, and anything that's been mailed-in
 # 

Modified: spamassassin/trunk/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/listpromotable?rev=416088&r1=416087&r2=416088&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/listpromotable (original)
+++ spamassassin/trunk/build/mkupdates/listpromotable Wed Jun 21 12:40:49 2006
@@ -188,6 +188,7 @@
     my $pkg = $1;
     # grep out the ones we *do* have, and do use in "ifplugin"
     # lines in "rulesrc", here...
+    next;   #JMD:
     next if ($pkg =~ /${PROMOTABLE_PLUGINS_RE}/o);
     print "\n# not publishing $name: needs $ifs\n";
     $skip++;