You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2005/04/10 10:28:44 UTC
svn commit: r160758 - spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
Author: quinlan
Date: Sun Apr 10 01:28:43 2005
New Revision: 160758
URL: http://svn.apache.org/viewcvs?view=rev&rev=160758
Log:
bug 4240: make non-fatal configuration errors use info()-level messages
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&r1=160757&r2=160758
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Sun Apr 10 01:28:43 2005
@@ -74,6 +74,7 @@
# Make the main dbg() accessible in our package w/o an extra function
*dbg=\&Mail::SpamAssassin::dbg;
+*info=\&Mail::SpamAssassin::info;
use strict;
use warnings;
@@ -229,7 +230,7 @@
if ($self->{lint_rules}) {
warn $msg."\n";
} else {
- dbg($msg);
+ info($msg);
}
$self->{errors}++;
return;
@@ -256,7 +257,7 @@
if ($self->{lint_rules}) {
warn $msg."\n";
} else {
- dbg($msg);
+ info($msg);
}
$self->{errors}++;
return;
@@ -588,7 +589,7 @@
}
# if we get here, note the issue, then we'll fail through for an error.
- dbg("config: rewrite_header: ignoring $hdr, not From, Subject, or To");
+ info("config: rewrite_header: ignoring $hdr, not From, Subject, or To");
}
});
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?view=diff&r1=160757&r2=160758
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Sun Apr 10 01:28:43 2005
@@ -122,6 +122,7 @@
# Make the main dbg() accessible in our package w/o an extra function
*dbg=\&Mail::SpamAssassin::dbg;
+*info=\&Mail::SpamAssassin::info;
use Mail::SpamAssassin::Conf;
use Mail::SpamAssassin::Constants qw(:sa);
@@ -358,11 +359,11 @@
if ($cmd) {
if ($self->{scoresonly}) { # reading user config from spamd
if ($cmd->{is_priv} && !$conf->{allow_user_rules}) {
- dbg("config: not parsing, 'allow_user_rules' is 0: $line");
+ info("config: not parsing, 'allow_user_rules' is 0: $line");
goto failed_line;
}
if ($cmd->{is_admin}) {
- dbg("config: not parsing, administrator setting: $line");
+ info("config: not parsing, administrator setting: $line");
goto failed_line;
}
}
@@ -415,7 +416,7 @@
if ($conf->{lint_rules}) {
warn $msg."\n";
} else {
- dbg($msg);
+ info($msg);
}
$conf->{errors}++;
}