Changeset 2370 for trunk/locker/deploy/bin/django

Timestamp:

Feb 9, 2013, 5:48:21 PM (12 years ago)

Author:

cereslee

Message:

Merged the -r 2369 from locker-dev to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• locker (modified) (1 prop)
• 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',";
@@ -64 +66 @@
     $_ = "        'NAME': '$sqldb',";
   } elsif (/'USER'/) {
-    $_ = "        'USER': '$sqluser',";
+    $_ = "        'OPTIONS': {\n            'read_default_file' : os.path.expanduser('~/.my.cnf'),\n        },";
   } elsif (/'PASSWORD'/) {
-    $_ = "        'PASSWORD': '$sqlpass',";
+      next;
   } elsif (/'HOST'/) {
-    $_ = "        'HOST': '$sqlhost',";
+      next;
   } elsif (/Chicago/) {
     $_ =~ s/Chicago/New_York/;