Mailing List Archive

svn commit: rev 6698 - incubator/spamassassin/trunk
Author: felicity
Date: Mon Feb 16 18:10:58 2004
New Revision: 6698

Modified:
incubator/spamassassin/trunk/spamassassin.raw
Log:
bug 3050: 'spamassassin -D' would only show the rewritten message being parsed, and not the original due to the debug code being setup after the parse had occured.

Modified: incubator/spamassassin/trunk/spamassassin.raw
==============================================================================
--- incubator/spamassassin/trunk/spamassassin.raw (original)
+++ incubator/spamassassin/trunk/spamassassin.raw Mon Feb 16 18:10:58 2004
@@ -133,12 +133,6 @@
$doing_address_only_whitelisting = 1;
}

- my $mail;
-
- if (!$opt{'lint'} && !$doing_address_only_whitelisting) {
- $mail = Mail::SpamAssassin::MsgParser->parse ();
- }
-
# create the tester factory
my $spamtest = new Mail::SpamAssassin ({
rules_filename => $opt{'configpath'},
@@ -166,6 +160,15 @@

if ($opt{'lint'}) {
exit $spamtest->lint_rules ();
+ }
+
+ my $mail;
+
+ # Unless we're doing whitelisting activities, go ahead and parse the
+ # incoming message
+ #
+ if (!$doing_address_only_whitelisting) {
+ $mail = Mail::SpamAssassin::MsgParser->parse ();
}

# handle removing reports