svn commit: rev 9505 - incubator/spamassassin/trunk/lib/Mail

[jm...@apache.org]

Author: jm
Date: Mon Mar 15 18:40:33 2004
New Revision: 9505

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
Log:
look for init.pre in system rules dir if not in /etc/mail; used to support running from build dir

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm	Mon Mar 15 18:40:33 2004
@@ -1215,15 +1215,25 @@
     # even the system config.
     my $siterules = $self->{site_rules_filename};
     $siterules ||= $self->first_existing_path (@site_rules_path);
+
+    my $sysrules = $self->{rules_filename};
+    $sysrules ||= $self->first_existing_path (@default_rules_path);
+
     if ($siterules) {
       $fname = File::Spec->catfile ($siterules, "init.pre");
+
       if (-f $fname) {
         $self->{config_text} .= $self->read_cf ($fname, 'site rules init.pre');
+
+      } else {
+        $fname = File::Spec->catfile ($sysrules, "init.pre");
+        if (-f $fname) {
+          $self->{config_text} .= $self->read_cf ($fname, 'sys rules init.pre');
+        }
       }
     }
 
-    $fname = $self->{rules_filename};
-    $fname ||= $self->first_existing_path (@default_rules_path);
+    $fname = $sysrules;
     if ($fname) {
       $self->{config_text} .= $self->read_cf ($fname, 'default rules dir');
       if (-f "$fname/languages") {