diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-01-15 16:06:56 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-01-15 16:06:56 +0000 |
| commit | aef0283f89a0667914ad3524c125ce4efbdad9b9 (patch) | |
| tree | 688cf3338d213b9f4dfeede076a14aba384e8934 | |
| parent | c35399ba0da5a266138c2332ce8d54089e3949ac (diff) | |
Fixed #17468 -- Made sure the project/app template management command tests correctly handle an existing directory on Windows.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/management/templates.py | 7 | ||||
| -rw-r--r-- | tests/regressiontests/admin_scripts/tests.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/django/core/management/templates.py b/django/core/management/templates.py index f768cc6999..0a6a3a8932 100644 --- a/django/core/management/templates.py +++ b/django/core/management/templates.py @@ -1,5 +1,6 @@ from __future__ import with_statement import cgi +import errno import mimetypes import os import posixpath @@ -77,7 +78,11 @@ class TemplateCommand(BaseCommand): try: os.makedirs(top_dir) except OSError, e: - raise CommandError(e) + if e.errno == errno.EEXIST: + message = "'%s' already exists" % top_dir + else: + message = e + raise CommandError(message) else: top_dir = path.expanduser(target) diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 0a7c56c86e..17a2ccb194 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -1382,7 +1382,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase): # running again.. out, err = self.run_django_admin(args) self.assertNoOutput(out) - self.assertOutput(err, "File exists") + self.assertOutput(err, "already exists") def test_invalid_project_name(self): "Make sure the startproject management command validates a project name" |