svn commit: rev 22685 - spamassassin/trunk/lib/Mail

[fe...@apache.org]

Author: felicity
Date: Wed Jul  7 14:36:52 2004
New Revision: 22685

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin.pm
Log:
bug 3517: if both userstate_dir and user_dir were specified, user_dir would be used to derive userstate_dir even though it was explicitly specified.  the code will now use userstate_dir if defined, then derive from user_dir if possible, then revert to the system default if nothing else is available.

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm	Wed Jul  7 14:36:52 2004
@@ -1410,11 +1410,12 @@
   my $fname;
 
   # If vpopmail is enabled then set fname to virtual homedir
-  #
-  if (defined $self->{user_dir}) {
-    $fname = File::Spec->catdir ($self->{user_dir}, ".spamassassin");
-  } elsif (defined $self->{userstate_dir}) {
+  # precedence: userstate_dir, derive from user_dir, system default
+  if (defined $self->{userstate_dir}) {
     $fname = $self->{userstate_dir};
+  }
+  elsif (defined $self->{user_dir}) {
+    $fname = File::Spec->catdir ($self->{user_dir}, ".spamassassin");
   }
 
   $fname ||= $self->first_existing_path (@default_userstate_dir);