Ticket #4282: 4282_against_16741.diff

django/core/management/base.py

@@ -370 +370 @@
     # other_name -- When copying an application layout, this should be the name
     #               of the project.
     import re
-    import shutil
     other = {'project': 'app', 'app': 'project'}[app_or_project]
     if not re.search(r'^[_a-zA-Z]\w*$', name): # If it's not a valid directory name.
         # Provide a smart error message, depending on the error.
@@ -410 +409 @@
             fp_old.close()
             fp_new.close()
             try:
-                shutil.copymode(path_old, path_new)
+                _copy_execute_permission(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 _copy_execute_permission(path_old, path_new):
+    """
+    Copy files respecting the user's umask if supported by the OS
+    
+    """
+    import stat 
+    if hasattr(os, 'chmod'): 
+        st = os.stat(path_old) 
+        mode = stat.S_IMODE(st.st_mode) 
+        if mode & 0111: 
+            new_mode = stat.S_IMODE(os.stat(path_new).st_mode) 
+            os.chmod(path_new, new_mode | 0111)
+
 def _make_writeable(filename):
     """
     Make sure that the file is writeable. Useful if our source is