Anonymous avatar Anonymous committed d834ef7

Fixed #17468 -- Made sure the project/app template management command tests correctly handle an existing directory on Windows.

Comments (0)

Files changed (2)

django/core/management/templates.py

 from __future__ import with_statement
 import cgi
+import errno
 import mimetypes
 import os
 import posixpath
             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

         # 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"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.