Changeset 2368 for trunk

Timestamp:

Feb 9, 2013, 5:19:11 PM (11 years ago)

Author:

achernya

Message:

Revert r2367, as it should go to locker-dev first

File:

• trunk/locker/deploy/bin/django (modified) (2 diffs)

trunk/locker/deploy/bin/django

@@ -59 +59 @@
   if (/Your Name/) {
     $_ = "    ('$USER', '$email'),";
-  } elsif (/^DEBUG = /) {
-      $_ =~ s/DEBUG/import os\n\nDEBUG/;
   } elsif (/'ENGINE'/) {
     $_ = "        'ENGINE': 'django.db.backends.mysql',";
@@ -66 +64 @@
     $_ = "        'NAME': '$sqldb',";
   } elsif (/'USER'/) {
-    $_ = "        'OPTIONS': {\n            'read_default_file' : os.path.expanduser('~/.my.cnf'),\n        },";
+    $_ = "        'USER': '$sqluser',";
   } elsif (/'PASSWORD'/) {
-      next;
+    $_ = "        'PASSWORD': '$sqlpass',";
   } elsif (/'HOST'/) {
-      next;
+    $_ = "        'HOST': '$sqlhost',";
   } elsif (/Chicago/) {
     $_ =~ s/Chicago/New_York/;