diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-01-25 02:15:39 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-01-25 02:15:39 +0000 |
| commit | 75a3617d7941ca9484bccab09221dcc51762701a (patch) | |
| tree | 8d0816562b29528f7d487b2a0ab461de70eebfab /django/core | |
| parent | 668671561dab5efa68f575997bf9d655174ee686 (diff) | |
newforms-admin: Merged to [4425]
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core')
| -rw-r--r-- | django/core/management.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/management.py b/django/core/management.py index cbea3bafbc..885a1c10bc 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -25,7 +25,7 @@ APP_ARGS = '[appname ...]' # which has been installed. PROJECT_TEMPLATE_DIR = os.path.join(django.__path__[0], 'conf', '%s_template') -INVALID_PROJECT_NAMES = ('django', 'test') +INVALID_PROJECT_NAMES = ('django', 'site', 'test') # Set up the terminal color scheme. class dummy: pass @@ -708,7 +708,7 @@ def startproject(project_name, directory): "Creates a Django project for the given project_name in the given directory." from random import choice if project_name in INVALID_PROJECT_NAMES: - sys.stderr.write(style.ERROR("Error: %r isn't a valid project name. Please try another.\n" % project_name)) + sys.stderr.write(style.ERROR("Error: '%r' conflicts with the name of an existing Python module and cannot be used as a project name. Please try another name.\n" % project_name)) sys.exit(1) _start_helper('project', project_name, directory) # Create a random SECRET_KEY hash, and put it in the main settings. |