You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/23 19:33:19 UTC
svn commit: r1844692 - in /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin:
DCC.pm Pyzor.pm Razor2.pm
Author: hege
Date: Tue Oct 23 19:33:19 2018
New Revision: 1844692
URL: http://svn.apache.org/viewvc?rev=1844692&view=rev
Log:
Skip unneeded $opts->{conf}->{tests} check
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=1844692&r1=1844691&r2=1844692&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Tue Oct 23 19:33:19 2018
@@ -736,17 +736,13 @@ sub finish_parsing_start {
$self->find_dcc_home();
if ($self->is_dccifd_available()) {
foreach (@{$opts->{conf}->{eval_to_rule}->{check_dcc}}) {
- if (exists $opts->{conf}->{tests}->{$_}) {
- dbg("dcc: adjusting rule $_ priority to -100");
- $opts->{conf}->{priority}->{$_} = -100;
- }
+ dbg("dcc: adjusting rule $_ priority to -100");
+ $opts->{conf}->{priority}->{$_} = -100;
}
if ($opts->{conf}->{use_dcc_rep}) {
foreach (@{$opts->{conf}->{eval_to_rule}->{check_dcc_reputation_range}}) {
- if (exists $opts->{conf}->{tests}->{$_}) {
- dbg("dcc: adjusting rule $_ priority to -100");
- $opts->{conf}->{priority}->{$_} = -100;
- }
+ dbg("dcc: adjusting rule $_ priority to -100");
+ $opts->{conf}->{priority}->{$_} = -100;
}
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=1844692&r1=1844691&r2=1844692&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Tue Oct 23 19:33:19 2018
@@ -283,10 +283,8 @@ sub finish_parsing_start {
# Find rulenames from eval_to_rule mappings
if ($opts->{conf}->{pyzor_fork}) {
foreach (@{$opts->{conf}->{eval_to_rule}->{check_pyzor}}) {
- if (exists $opts->{conf}->{tests}->{$_}) {
- dbg("pyzor: adjusting rule $_ priority to -100");
- $opts->{conf}->{priority}->{$_} = -100;
- }
+ dbg("pyzor: adjusting rule $_ priority to -100");
+ $opts->{conf}->{priority}->{$_} = -100;
}
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm?rev=1844692&r1=1844691&r2=1844692&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm Tue Oct 23 19:33:19 2018
@@ -404,16 +404,12 @@ sub finish_parsing_start {
# Find rulenames from eval_to_rule mappings
if ($opts->{conf}->{razor_fork}) {
foreach (@{$opts->{conf}->{eval_to_rule}->{check_razor2}}) {
- if (exists $opts->{conf}->{tests}->{$_}) {
- dbg("razor2: adjusting rule $_ priority to -100");
- $opts->{conf}->{priority}->{$_} = -100;
- }
+ dbg("razor2: adjusting rule $_ priority to -100");
+ $opts->{conf}->{priority}->{$_} = -100;
}
foreach (@{$opts->{conf}->{eval_to_rule}->{check_razor2_range}}) {
- if (exists $opts->{conf}->{tests}->{$_}) {
- dbg("razor2: adjusting rule $_ priority to -100");
- $opts->{conf}->{priority}->{$_} = -100;
- }
+ dbg("razor2: adjusting rule $_ priority to -100");
+ $opts->{conf}->{priority}->{$_} = -100;
}
}
}