Commit aef0283f authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #17468 -- Made sure the project/app template management command tests... 

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
parent c35399ba

django/core/management/templates.py

+6 −1
Original line number Diff line number Diff line 
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)

tests/regressiontests/admin_scripts/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -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"