svn commit: r410676 - /spamassassin/trunk/lib/Mail/SpamAssassin.pm

[fe...@apache.org]

Author: felicity
Date: Wed May 31 14:36:22 2006
New Revision: 410676

URL: http://svn.apache.org/viewvc?rev=410676&view=rev
Log:
bug 4932: make sure the default_userstate_dir is created, even if the prefs aren't going to be copied.

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=410676&r1=410675&r2=410676&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Wed May 31 14:36:22 2006
@@ -1481,17 +1481,17 @@
 
   $fname ||= $self->first_existing_path (@default_userstate_dir);
 
-  if (!$self->{dont_copy_prefs}) {
-    # bug 4932: use the last default_userstate_dir entry if none of the others
-    # already exist
-    $fname ||= $self->sed_path($default_userstate_dir[-1]);
+  # bug 4932: use the last default_userstate_dir entry if none of the others
+  # already exist
+  $fname ||= $self->sed_path($default_userstate_dir[-1]);
 
+  if (!$self->{dont_copy_prefs}) {
     dbg("config: using \"$fname\" for user state dir");
+  }
 
-    if (!-d $fname) {
-      # not being able to create the *dir* is not worth a warning at all times
-      eval { mkpath($fname, 0, 0700) } or dbg("config: mkdir $fname failed: $@ $!\n");
-    }
+  if (!-d $fname) {
+    # not being able to create the *dir* is not worth a warning at all times
+    eval { mkpath($fname, 0, 0700) } or dbg("config: mkdir $fname failed: $@ $!\n");
   }
 
   $fname;