Mailing List Archive

Author: felicity
Date: Sat Mar 27 20:13:24 2004
New Revision: 9797

Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
incubator/spamassassin/trunk/t/spamd_hup.t
Log:
3.0 requires perl 5.6.1, so remove more code that is kluging around 5.005, etc. also, found that ArchiveIterator was unnecessarily figuring out the class letter (h vs s) more often than was required...

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm Sat Mar 27 20:13:24 2004
@@ -244,12 +244,11 @@

foreach my $target (@${targets}) {
my ($class, $format, $rawloc) = split(/:/, $target, 3);
+ $class = substr($class, 0, 1) || 'h'; # use ham by default

my @locations = $self->fix_globs($rawloc);

foreach my $location (@locations) {
- $class = substr($class, 0, 1) || 'h'; # use ham by default
-
my $method;

if ($format eq 'detect') {
@@ -693,14 +692,8 @@

my @paths;

- if ($] < 5.006 && Mail::SpamAssassin::Util::am_running_in_taint_mode()) {
- # glob is not allowed in taint-mode on 5.005
- push(@paths, $path);
- }
- else {
- # apply csh-style globs: ./corpus/*.mbox => er, you know what it does ;)
- @paths = glob $path;
- }
+ # apply csh-style globs: ./corpus/*.mbox => er, you know what it does ;)
+ @paths = glob $path;
return @paths;
}


Modified: incubator/spamassassin/trunk/t/spamd_hup.t
==============================================================================
--- incubator/spamassassin/trunk/t/spamd_hup.t (original)
+++ incubator/spamassassin/trunk/t/spamd_hup.t Sat Mar 27 20:13:24 2004
@@ -2,7 +2,7 @@

use lib '.'; use lib 't';
use SATest; sa_t_init("spamd_hup");
-use constant TEST_ENABLED => !$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS && ($] >= 5.006);
+use constant TEST_ENABLED => !$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS;

use Test; BEGIN { plan tests => (TEST_ENABLED? 8 : 0) };