You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2021/04/11 10:25:13 UTC
svn commit: r1888615 - /spamassassin/trunk/lib/Mail/SpamAssassin.pm
Author: hege
Date: Sun Apr 11 10:25:12 2021
New Revision: 1888615
URL: http://svn.apache.org/viewvc?rev=1888615&view=rev
Log:
Check that search paths are directories
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1888615&r1=1888614&r2=1888615&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Sun Apr 11 10:25:12 2021
@@ -1988,8 +1988,10 @@ sub find_rule_support_file {
my @paths;
# search custom directories first
- push @paths, $self->{site_rules_filename} if $self->{site_rules_filename};
- push @paths, $self->{rules_filename} if $self->{rules_filename};
+ push @paths, $self->{site_rules_filename}
+ if $self->{site_rules_filename} && -d $self->{site_rules_filename};
+ push @paths, $self->{rules_filename}
+ if $self->{rules_filename} && -d $self->{rules_filename};
# updates sub-directory missing from @default_rules_path
push @paths, '__local_state_dir__/__version__/updates_spamassassin_org';
push @paths, @default_rules_path;