You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2005/11/12 22:40:39 UTC
svn commit: r332842 - /spamassassin/trunk/build/mkrules
Author: felicity
Date: Sat Nov 12 13:40:37 2005
New Revision: 332842
URL: http://svn.apache.org/viewcvs?rev=332842&view=rev
Log:
fix typo in mkrules
Modified:
spamassassin/trunk/build/mkrules
Modified: spamassassin/trunk/build/mkrules
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/mkrules?rev=332842&r1=332841&r2=332842&view=diff
==============================================================================
--- spamassassin/trunk/build/mkrules (original)
+++ spamassassin/trunk/build/mkrules Sat Nov 12 13:40:37 2005
@@ -108,7 +108,7 @@
sub lint_output_files {
foreach my $file (keys %{$files_to_lint}) {
- my $text = $output_file_text->{file};
+ my $text = $output_file_text->{$file};
if (lint_rule_text($text) != 0) {
warn "\nERROR: LINT FAILED, suppressing output: $file\n\n";
delete $output_file_text->{$file};
Re: Nightly runs still not working right
Posted by Theo Van Dinter <fe...@apache.org>.
Ok, so I did some debugging and fixed my ongoing issue (committed patch below):
-------------
config: warning: score set for non-existent rule MPART_ALT_DIFF
ERROR: LINT FAILED, suppressing output: rules/70_sandbox.cf
-------------
However, this now causes sandbox to still not be created because mkrules
doesn't like the config options that plugins provide:
-------------
config: failed to parse line, skipping: replace_rules T_FUZZY_REPLICA
config: failed to parse line, skipping: replace_rules T_FUZZY_SPRM
config: failed to parse line, skipping: urirhsbl T_URIBL_XS_SURBL xs.surbl.org. A
ERROR: LINT FAILED, suppressing output: rules/70_sandbox.cf
rules/70_sandbox.cf: no rules promoted
-------------
:( I put in another commit which should fix this. Basically, all of the
rules that need a plugin ought to be surrounded by ifplugin...endif lines. My
commit allows conditionals to surround "unknown" lines, so things like
"replace_rules" and such are dealt with. I also had to change the order that
things get output so that, in theory, the replace_rules lines happen after the
rule definitions. I'm sure someone will yell at me if it's too klugy.
ie: instead of:
-------------
replace_rules T_FUZZY_REPLICA
replace_rules T_FUZZY_SPRM
ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
body T_FUZZY_REPLICA /<inter W1><post P2>(?!replica)<R><E><P><L><I><C><A>/i
endif
ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
body T_FUZZY_SPRM /<inter W1><post P2><S><P><U><R><M>/i
endif
-------------
we now get:
-------------
ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
body T_FUZZY_REPLICA /<inter W1><post P2>(?!replica)<R><E><P><L><I><C><A>/i
endif
ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
body T_FUZZY_SPRM /<inter W1><post P2><S><P><U><R><M>/i
endif
ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
replace_rules T_FUZZY_REPLICA
replace_rules T_FUZZY_SPRM
endif
-------------
So now I actually get the appropriate 70_sandbox.cf and such created. :)
On Sat, Nov 12, 2005 at 09:40:39PM -0000, felicity@apache.org wrote:
> --- spamassassin/trunk/build/mkrules (original)
> +++ spamassassin/trunk/build/mkrules Sat Nov 12 13:40:37 2005
> @@ -108,7 +108,7 @@
>
> sub lint_output_files {
> foreach my $file (keys %{$files_to_lint}) {
> - my $text = $output_file_text->{file};
> + my $text = $output_file_text->{$file};
> if (lint_rule_text($text) != 0) {
> warn "\nERROR: LINT FAILED, suppressing output: $file\n\n";
> delete $output_file_text->{$file};
>
--
Randomly Generated Tagline:
Always first decide the sentence, then the verdict.