Changeset 2310

Timestamp:

Aug 29, 2012, 1:27:43 PM (13 years ago)

Author:

achernya

Message:

Merge r2309 from locker-dev to trunk

Location:

trunk/locker

Files:

• . (modified) (1 prop)
• deploy/bin/django (modified) (3 diffs)

trunk/locker/deploy/bin/django

@@ -17 +17 @@
 #!/usr/bin/env python
 import sys, os, time, threading, django.utils.autoreload
-sys.path.insert(0, "/mit/$USER/Scripts/django")
+sys.path.insert(0, "/mit/$USER/Scripts/django/$name")
 os.chdir("/mit/$USER/Scripts/django/$name")
 os.environ['DJANGO_SETTINGS_MODULE'] = "$name.settings"
@@ -51 +51 @@
 chdir "/mit/$USER/Scripts/django/";
 system(qw{django-admin startproject}, $name)==0 or die "\nFailed to create app.\n\n";
-chdir "$name";
+chdir "$name/$name";
 
 open SETTINGS, "settings.py";
@@ -106 +106 @@
 rename "urls.py.new", "urls.py";
 
+chdir "..";
+
 print "Initializing your project's SQL database schema...\n";
 system qw{./manage.py syncdb --noinput};