summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-03-19 04:04:19 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-03-19 04:04:19 +0000
commit32933d27b23f4cf0a142f797e2fda8af2434a1e4 (patch)
tree05f79e15f07381c8d18e968b1bf53e1cc4719504
parent7d74376aabc64952264c12798ba9dcf868e195f0 (diff)
Fixed a corner case in management.setup_environ (it was triggered under Cygwin, but also perhaps could happen elsewhere). Thanks, Doug Napoleone.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--AUTHORS1
-rw-r--r--django/core/management/__init__.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 7a839faf88..f535ddda0f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -257,6 +257,7 @@ answer newbie questions, and generally made Django that much better:
Robin Munn <http://www.geekforgod.com/>
Robert Myers <myer0052@gmail.com>
Nebojša Dorđević
+ Doug Napoleone <doug@dougma.com>
Gopal Narayanan <gopastro@gmail.com>
Fraser Nevett <mail@nevett.org>
Sam Newman <http://www.magpiebrain.com/>
diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
index d78e2eda0b..819b19a366 100644
--- a/django/core/management/__init__.py
+++ b/django/core/management/__init__.py
@@ -243,7 +243,7 @@ def setup_environ(settings_mod):
# way. For example, if this file (manage.py) lives in a directory
# "myproject", this code would add "/path/to/myproject" to sys.path.
project_directory, settings_filename = os.path.split(settings_mod.__file__)
- if not project_directory:
+ if project_directory == os.curdir or not project_directory:
project_directory = os.getcwd()
project_name = os.path.basename(project_directory)
settings_name = os.path.splitext(settings_filename)[0]