From aeff2cb530fb2a0234bac4fb31aa650d4395f55a Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Tue, 26 Jul 2005 22:15:51 +0000 Subject: [PATCH] Fixed #93 -- Fixed 'django-admin startproject' to use os.path.join instead of string concatenation git-svn-id: http://code.djangoproject.com/svn/django/trunk@322 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/management.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/core/management.py b/django/core/management.py index 4627b497ba..a2953205b2 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -16,8 +16,8 @@ APP_ARGS = '[app app ...]' # Use django.__path__[0] because we don't know which directory django into # which has been installed. -PROJECT_TEMPLATE_DIR = django.__path__[0] + '/conf/%s_template' -ADMIN_TEMPLATE_DIR = django.__path__[0] + '/conf/admin_templates' +PROJECT_TEMPLATE_DIR = os.path.join(django.__path__[0], 'conf/%s_template') +ADMIN_TEMPLATE_DIR = os.path.join(django.__path__[0], 'conf/admin_templates') def _get_packages_insert(app_label): return "INSERT INTO packages (label, name) VALUES ('%s', '%s');" % (app_label, app_label)