You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spamassassin.apache.org by jm...@apache.org on 2008/09/26 12:19:08 UTC

svn commit: r699256 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm

Author: jm
Date: Fri Sep 26 03:19:07 2008
New Revision: 699256

URL: http://svn.apache.org/viewvc?rev=699256&view=rev
Log:
bug #5989: fix 'Subroutine __VBOUNCE_VALERT_one_line_body_test redefined' errors when running sa-compile with allow_user_rules set

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm?rev=699256&r1=699255&r2=699256&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm Fri Sep 26 03:19:07 2008
@@ -117,6 +117,9 @@
 
     }
 
+    return if ($opts{doing_user_rules} &&
+                  !$self->is_user_rule_sub($rulename.'_one_line_body_test'));
+
     $self->add_temporary_method ($rulename.'_one_line_body_test', '{'.$sub.'}');
   },
     pre_loop_body => sub