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
This commit is contained in:
parent
7d74376aab
commit
32933d27b2
1
AUTHORS
1
AUTHORS
|
@ -257,6 +257,7 @@ answer newbie questions, and generally made Django that much better:
|
||||||
Robin Munn <http://www.geekforgod.com/>
|
Robin Munn <http://www.geekforgod.com/>
|
||||||
Robert Myers <myer0052@gmail.com>
|
Robert Myers <myer0052@gmail.com>
|
||||||
Nebojša Dorđević
|
Nebojša Dorđević
|
||||||
|
Doug Napoleone <doug@dougma.com>
|
||||||
Gopal Narayanan <gopastro@gmail.com>
|
Gopal Narayanan <gopastro@gmail.com>
|
||||||
Fraser Nevett <mail@nevett.org>
|
Fraser Nevett <mail@nevett.org>
|
||||||
Sam Newman <http://www.magpiebrain.com/>
|
Sam Newman <http://www.magpiebrain.com/>
|
||||||
|
|
|
@ -243,7 +243,7 @@ def setup_environ(settings_mod):
|
||||||
# way. For example, if this file (manage.py) lives in a directory
|
# way. For example, if this file (manage.py) lives in a directory
|
||||||
# "myproject", this code would add "/path/to/myproject" to sys.path.
|
# "myproject", this code would add "/path/to/myproject" to sys.path.
|
||||||
project_directory, settings_filename = os.path.split(settings_mod.__file__)
|
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_directory = os.getcwd()
|
||||||
project_name = os.path.basename(project_directory)
|
project_name = os.path.basename(project_directory)
|
||||||
settings_name = os.path.splitext(settings_filename)[0]
|
settings_name = os.path.splitext(settings_filename)[0]
|
||||||
|
|
Loading…
Reference in New Issue