Changeset 6028

Timestamp:

08/30/07 23:35:03 (1 year ago)

Author:

adrian

Message:

Fixed #5307 -- startproject/startapp now makes sure all files it creates are writeable. Thanks, Thomas Stromberg

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/management/base.py (modified) (3 diffs)
• django/trunk/django/core/management/commands/startproject.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -259 +259 @@
-    Thomas Steinacher <http://www.eggdrop.ch/>
-    nowell strite
+    Thomas Stromberg <tstromberg@google.com>
-    Sundance
-    SuperJared

django/trunk/django/core/management/base.py

@@ -2 +2 @@
-from django.core.management.color import color_style
-import sys
+import os
-
-class CommandError(Exception):
@@ -122 +123 @@
-def copy_helper(style, app_or_project, name, directory, other_name=''):
-    import django
-    import os
-    import re
-    import shutil
@@ -158 +158 @@
-            try:
-                shutil.copymode(path_old, path_new)
+                _make_writeable(path_new)
-            except OSError:
-                sys.stderr.write(style.NOTICE("Notice: Couldn't set permission bits on %s. You're probably using an uncommon filesystem setup. No problem.\n" % path_new))
+
+def _make_writeable(filename):
+    "Makes sure that the file is writeable. Useful if our source is read-only."
+    import stat
+    if not os.access(filename, os.W_OK):
+      st = os.stat(filename)
+      new_permissions = stat.S_IMODE(st.st_mode) | stat.S_IWUSR
+      os.chmod(filename, new_permissions)
+

django/trunk/django/core/management/commands/startproject.py

@@ -29 +29 @@
-        main_settings_file = os.path.join(directory, project_name, 'settings.py')
-        settings_contents = open(main_settings_file, 'r').read()
-
-        # If settings.py was copied from a read-only source, make it writeable.
-        if not os.access(main_settings_file, os.W_OK):
-            os.chmod(main_settings_file, 0600)
-
-        fp = open(main_settings_file, 'w')
-        secret_key = ''.join([choice('abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)') for i in range(50)])