You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2011/07/27 02:09:23 UTC
svn commit: r1151297 - in /spamassassin/trunk: lib/Mail/
lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/Plugin/ xt/
Author: mmartinec
Date: Wed Jul 27 00:09:21 2011
New Revision: 1151297
URL: http://svn.apache.org/viewvc?rev=1151297&view=rev
Log:
fix a Test::Perl::Critic Variables::RequireLexicalLoopIterators bug as reported by xt/60_perlcritic.t
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
spamassassin/trunk/xt/60_perlcritic.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1151297&r1=1151296&r2=1151297&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Wed Jul 27 00:09:21 2011
@@ -2124,7 +2124,7 @@ sub find_all_addrs_in_mail {
my @ret;
my %done;
- foreach $_ (@addrlist) {
+ foreach (@addrlist) {
s/^mailto://; # from Outlook "forwarded" message
next if defined ($done{$_}); $done{$_} = 1;
push (@ret, $_);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1151297&r1=1151296&r2=1151297&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Jul 27 00:09:21 2011
@@ -4045,9 +4045,8 @@ sub trim_rules {
my ($self, $regexp) = @_;
my @all_rules;
- my $rule_type;
- foreach $rule_type ($self->get_rule_types()) {
+ foreach my $rule_type ($self->get_rule_types()) {
push(@all_rules, $self->get_rule_keys($rule_type));
}
@@ -4068,7 +4067,7 @@ sub trim_rules {
$rules_to_keep_hash{$rule} = 1;
}
- foreach $rule_type ($self->get_rule_types()) {
+ foreach my $rule_type ($self->get_rule_types()) {
foreach my $rulekey ($self->get_rule_keys($rule_type)) {
$self->delete_rule($rule_type, $rulekey)
if (!$rules_to_keep_hash{$rulekey});
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm?rev=1151297&r1=1151296&r2=1151297&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm Wed Jul 27 00:09:21 2011
@@ -386,25 +386,25 @@ sub _learn_trapped {
@msgid = $self->get_msgid($msg);
}
- foreach $msgid ( @msgid ) {
- my $seen = $self->{store}->seen_get ($msgid);
+ foreach my $msgid_t ( @msgid ) {
+ my $seen = $self->{store}->seen_get ($msgid_t);
if (defined ($seen)) {
if (($seen eq 's' && $isspam) || ($seen eq 'h' && !$isspam)) {
- dbg("bayes: $msgid already learnt correctly, not learning twice");
+ dbg("bayes: $msgid_t already learnt correctly, not learning twice");
return 0;
} elsif ($seen !~ /^[hs]$/) {
- warn("bayes: db_seen corrupt: value='$seen' for $msgid, ignored");
+ warn("bayes: db_seen corrupt: value='$seen' for $msgid_t, ignored");
} else {
# bug 3704: If the message was already learned, don't try learning it again.
# this prevents, for instance, manually learning as spam, then autolearning
# as ham, or visa versa.
if ($self->{main}->{learn_no_relearn}) {
- dbg("bayes: $msgid already learnt as opposite, not re-learning");
+ dbg("bayes: $msgid_t already learnt as opposite, not re-learning");
return 0;
}
- dbg("bayes: $msgid already learnt as opposite, forgetting first");
+ dbg("bayes: $msgid_t already learnt as opposite, forgetting first");
# kluge so that forget() won't untie the db on us ...
my $orig = $self->{main}->{learn_caller_will_untie};
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm?rev=1151297&r1=1151296&r2=1151297&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm Wed Jul 27 00:09:21 2011
@@ -629,11 +629,11 @@ sub do_meta_tests {
# If there are any rules left, we can't solve the dependencies so complain
my %metas = map { $_ => 1 } @metas; # keep a small cache for fast lookups
- foreach $rulename (@metas) {
+ foreach my $rulename_t (@metas) {
$pms->{rule_errors}++; # flag to --lint that there was an error ...
my $msg =
- "rules: excluding meta test $rulename, unsolved meta dependencies: " .
- join(", ", grep($metas{$_}, @{ $rule_deps{$rulename} }));
+ "rules: excluding meta test $rulename_t, unsolved meta dependencies: " .
+ join(", ", grep($metas{$_}, @{ $rule_deps{$rulename_t} }));
if ($self->{main}->{lint_rules}) {
warn $msg."\n";
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1151297&r1=1151296&r2=1151297&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Wed Jul 27 00:09:21 2011
@@ -765,11 +765,9 @@ sub _get_received_header_times {
unshift @received, (shift @local);
}
- my $rcvd;
-
if (scalar(@local)) {
my (@fetchmail_times);
- foreach $rcvd (@local) {
+ foreach my $rcvd (@local) {
if ($rcvd =~ m/(\s.?\d+ \S\S\S \d+ \d+:\d+:\d+ \S+)/) {
my $date = $1;
dbg2("eval: trying Received fetchmail header date for real time: $date");
@@ -789,7 +787,7 @@ sub _get_received_header_times {
}
my (@header_times);
- foreach $rcvd (@received) {
+ foreach my $rcvd (@received) {
if ($rcvd =~ m/(\s.?\d+ \S\S\S \d+ \d+:\d+:\d+ \S+)/) {
my $date = $1;
dbg2("eval: trying Received header date for real time: $date");
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm?rev=1151297&r1=1151296&r2=1151297&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm Wed Jul 27 00:09:21 2011
@@ -58,8 +58,7 @@ sub new {
sub check_from_in_blacklist {
my ($self, $pms) = @_;
- local ($_);
- foreach $_ ($pms->all_from_addrs()) {
+ foreach ($pms->all_from_addrs()) {
if ($self->_check_whitelist ($self->{main}->{conf}->{blacklist_from}, $_)) {
return 1;
}
@@ -68,8 +67,7 @@ sub check_from_in_blacklist {
sub check_to_in_blacklist {
my ($self, $pms) = @_;
- local ($_);
- foreach $_ ($pms->all_to_addrs()) {
+ foreach ($pms->all_to_addrs()) {
if ($self->_check_whitelist ($self->{main}->{conf}->{blacklist_to}, $_)) {
return 1;
}
@@ -78,8 +76,7 @@ sub check_to_in_blacklist {
sub check_to_in_whitelist {
my ($self, $pms) = @_;
- local ($_);
- foreach $_ ($pms->all_to_addrs()) {
+ foreach ($pms->all_to_addrs()) {
if ($self->_check_whitelist ($self->{main}->{conf}->{whitelist_to}, $_)) {
return 1;
}
@@ -88,8 +85,7 @@ sub check_to_in_whitelist {
sub check_to_in_more_spam {
my ($self, $pms) = @_;
- local ($_);
- foreach $_ ($pms->all_to_addrs()) {
+ foreach ($pms->all_to_addrs()) {
if ($self->_check_whitelist ($self->{main}->{conf}->{more_spam_to}, $_)) {
return 1;
}
@@ -98,8 +94,7 @@ sub check_to_in_more_spam {
sub check_to_in_all_spam {
my ($self, $pms) = @_;
- local ($_);
- foreach $_ ($pms->all_to_addrs()) {
+ foreach ($pms->all_to_addrs()) {
if ($self->_check_whitelist ($self->{main}->{conf}->{all_spam_to}, $_)) {
return 1;
}
@@ -192,8 +187,7 @@ sub check_forged_in_default_whitelist {
sub _check_from_in_whitelist {
my ($self, $pms) = @_;
my $found_match = 0;
- local ($_);
- foreach $_ ($pms->all_from_addrs()) {
+ foreach ($pms->all_from_addrs()) {
if ($self->_check_whitelist ($self->{main}->{conf}->{whitelist_from}, $_)) {
$pms->{from_in_whitelist} = 1;
return;
@@ -217,8 +211,7 @@ sub _check_from_in_whitelist {
sub _check_from_in_default_whitelist {
my ($self, $pms) = @_;
my $found_match = 0;
- local ($_);
- foreach $_ ($pms->all_from_addrs()) {
+ foreach ($pms->all_from_addrs()) {
my $wh = $self->_check_whitelist_rcvd ($pms, $self->{main}->{conf}->{def_whitelist_from_rcvd}, $_);
if ($wh == 1) {
$pms->{from_in_default_whitelist} = 1;
Modified: spamassassin/trunk/xt/60_perlcritic.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/xt/60_perlcritic.t?rev=1151297&r1=1151296&r2=1151297&view=diff
==============================================================================
--- spamassassin/trunk/xt/60_perlcritic.t (original)
+++ spamassassin/trunk/xt/60_perlcritic.t Wed Jul 27 00:09:21 2011
@@ -29,7 +29,7 @@ print RC q{
severity = 5
verbose = 10
- exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest
+ exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest
[TestingAndDebugging::ProhibitNoStrict]
allow = refs