Mailing List Archive

Author: felicity
Date: Mon Feb 16 19:42:35 2004
New Revision: 6701

Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/CmdLearn.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MsgContainer.pm
incubator/spamassassin/trunk/masses/mass-check
Log:
get rid of MsgContainer::ignore() which nothing calls ... this also lets us get rid of the noexit setting code which is only used in ignore...

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/CmdLearn.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/CmdLearn.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/CmdLearn.pm Mon Feb 16 19:42:35 2004
@@ -326,7 +326,6 @@
$ma = Mail::SpamAssassin::MsgParser->parse ($dataref);
}

- $ma->{noexit} = 1;
my $status = $spamtest->learn ($ma, undef, $isspam, $forget);
my $learned = $status->did_learn();


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MsgContainer.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MsgContainer.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MsgContainer.pm Mon Feb 16 19:42:35 2004
@@ -50,7 +50,7 @@
sub new {
my $class = shift;
$class = ref($class) || $class;
- my %opts = @_;
+# my %opts = @_;

my $self = {
headers => {},
@@ -60,9 +60,10 @@
header_order => [],
};

- foreach ( 'noexit' ) {
- $self->{$_} = $opts{$_} if ( exists $opts{$_} );
- }
+# # allow callers to set certain options ...
+# foreach ( 'noexit' ) {
+# $self->{$_} = $opts{$_} if ( exists $opts{$_} );
+# }

bless($self,$class);

@@ -518,15 +519,6 @@
sub get_pristine_body {
my ($self) = @_;
return $self->{pristine_body};
-}
-
-=item ignore()
-
-=cut
-
-sub ignore {
- my ($self) = @_;
- exit (0) unless $self->{noexit};
}

# ---------------------------------------------------------------------------

Modified: incubator/spamassassin/trunk/masses/mass-check
==============================================================================
--- incubator/spamassassin/trunk/masses/mass-check (original)
+++ incubator/spamassassin/trunk/masses/mass-check Mon Feb 16 19:42:35 2004
@@ -243,15 +243,11 @@
my $out;

my $ma = Mail::SpamAssassin::MsgParser->parse($dataref);
- $ma->{noexit} = 1;

# remove SpamAssassin markup, if present and the mail was spam
$_ = $ma->get_header ("X-Spam-Status");
if (defined($_) && /^Yes, hits=/) {
- my $newtext = $spamtest->remove_spamassassin_markup($ma);
- my @newtext = split (/^/m, $newtext);
- $dataref = \@newtext;
- $ma = Mail::SpamAssassin::MsgParser->parse ($dataref);
+ $ma = Mail::SpamAssassin::MsgParser->parse ($spamtest->remove_spamassassin_markup($ma));
}

my $status = $spamtest->check($ma);