Bug 156568 - data dir is not correctly created

r=myk x2

diff --git a/checksetup.pl b/checksetup.pl
index 2804fe50d1fc122b813029fcc050db191c9212e7..f3827575422cd882ee8534ddfc395504bceaa296 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -636,7 +636,12 @@ $::ENV{'PATH'} = $origPath;
 # Create initial --DATA-- directory and make the initial empty files there:
 #
 
-unless (-d 'data') {
+# The |require "globals.pl"| above ends up creating a template object with
+# a COMPILE_DIR of 'data'. This means that TT creates the directory for us,
+# so this code wouldn't run if we just checked for the existance of the
+# directory. Instead, check for the existance of 'data/nomail', which is
+# created in this block
+unless (-d 'data' && -e 'data/nomail') {
     print "Creating data directory ...\n";
     # permissions for non-webservergroup are fixed later on
     mkdir 'data', 0770;