summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2006-08-06 10:35:25 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2006-08-06 10:35:25 +0000
commitae83871580c27ffaf876228cc66bb546a7c75db2 (patch)
treea361d494e0a818aa1b582df9e4a6c3ffc87f245b /django
parent27bf70dcb95997d8274af4d5006e3a6f9a1de040 (diff)
Fixed #2491 -- Pass the project directory back from setup_environ so that we
can set up the "startapp" command. Thanks, marcink@elksoft.pl. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/core/management.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management.py b/django/core/management.py
index e978ae0fd0..bddac1075a 100644
--- a/django/core/management.py
+++ b/django/core/management.py
@@ -1307,9 +1307,10 @@ def setup_environ(settings_mod):
# Set DJANGO_SETTINGS_MODULE appropriately.
os.environ['DJANGO_SETTINGS_MODULE'] = '%s.settings' % project_name
+ return project_directory
def execute_manager(settings_mod, argv=None):
- setup_environ(settings_mod)
+ project_directory = setup_environ(settings_mod)
action_mapping = DEFAULT_ACTION_MAPPING.copy()
# Remove the "startproject" command from the action_mapping, because that's