Changeset 1775 for trunk/locker

Timestamp:

Jan 24, 2011, 11:12:55 PM (14 years ago)

Author:

mitchb

Message:

Fix Django autoinstaller

The format of the database settings in settings.py changed.

(Merge of r1774 from branches/locker-dev to trunk)

File:

• trunk/locker/deploy/bin/django (modified) (1 diff, 1 prop)

trunk/locker/deploy/bin/django

@@ -56 +56 @@
   if (/Your Name/) {
     $_ = "    ('$USER', '$email'),";
-  } elsif (/^DATABASE_ENGINE/) {
-    $_ = "DATABASE_ENGINE = 'mysql'";
-  } elsif  (/^DATABASE_NAME/) {
-    $_ = "DATABASE_NAME = '$sqldb'";
-  } elsif (/^DATABASE_USER/) {
-    $_ = "DATABASE_USER = '$sqluser'";
-  } elsif (/^DATABASE_PASSWORD/) {
-    $_ = "DATABASE_PASSWORD = '$sqlpass'";
-  } elsif (/^DATABASE_HOST/) {
-    $_ = "DATABASE_HOST = '$sqlhost'";
+  } elsif (/'ENGINE'/) {
+    $_ = "        'ENGINE': 'django.db.backends.mysql',";
+  } elsif  (/'NAME'/) {
+    $_ = "        'NAME': '$sqldb',";
+  } elsif (/'USER'/) {
+    $_ = "        'USER': '$sqluser',";
+  } elsif (/'PASSWORD'/) {
+    $_ = "        'PASSWORD': '$sqlpass',";
+  } elsif (/'HOST'/) {
+    $_ = "        'HOST': '$sqlhost',";
   } elsif (/Chicago/) {
     $_ =~ s/Chicago/New_York/;