1. Luke Plant
  2. django


jez...@bcc190cf-cafb-0310-a4f2-bffc1f526a37  committed d834ef7

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

  • Participants
  • Parent commits 7b8e7cf
  • Branches default

Comments (0)

Files changed (2)

File django/core/management/templates.py

View file
  • Ignore whitespace
 from __future__ import with_statement
 import cgi
+import errno
 import mimetypes
 import os
 import posixpath
             except OSError, e:
-                raise CommandError(e)
+                if e.errno == errno.EEXIST:
+                    message = "'%s' already exists" % top_dir
+                else:
+                    message = e
+                raise CommandError(message)
             top_dir = path.expanduser(target)

File tests/regressiontests/admin_scripts/tests.py

View file
  • Ignore whitespace
         # running again..
         out, err = self.run_django_admin(args)
-        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"