svn commit: r489437 - /spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm

[jm...@apache.org]

Author: jm
Date: Thu Dec 21 10:49:21 2006
New Revision: 489437

URL: http://svn.apache.org/viewvc?view=rev&rev=489437
Log:
include the filename of the rules file in which errors are found in configuration-parsing lint error messages

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?view=diff&rev=489437&r1=489436&r2=489437
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Thu Dec 21 10:49:21 2006
@@ -443,10 +443,10 @@
       if ($migrated_keys{$key}) {
         # this key was moved into a plugin; non-fatal for lint
         $is_error = 0;
-        $msg = "config: failed to parse, now a plugin, skipping: $line";
+        $msg = "config: failed to parse, now a plugin, skipping, in \"$self->{currentfile}\": $line";
       } else {
         # a real syntax error; this is fatal for --lint
-        $msg = "config: failed to parse line, skipping: $line";
+        $msg = "config: failed to parse line, skipping, in \"$self->{currentfile}\": $line";
       }
     }
 
@@ -491,7 +491,7 @@
   }
 
   if ($bad) {
-    $self->lint_warn("bad 'if' line", undef);
+    $self->lint_warn("bad 'if' line, in \"$self->{currentfile}\"", undef);
     return -1;
   }