[Python-checkins] r73789 - in python/branches/release31-maint: Misc/NEWS setup.py

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Fri Jul  3 01:57:11 2009
New Revision: 73789

Log:
Merged revisions 73788 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r73788 | amaury.forgeotdarc | 2009-07-03 01:08:45 +0200 (ven., 03 juil. 2009) | 6 lines
  
  #4601: 'make install' did not set the permissions on library directories,
  only root could start IDLE for example.
  
  Beware that os.path.walk does not translate as is to os.walk!
  the former uses a callback to call on each dir, the latter is a generator...
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/setup.py

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Jul  3 01:57:11 2009
@@ -35,6 +35,9 @@
 Build
 -----
 
+- Issue 4601: 'make install' did not set the appropriate permissions on
+  directories.
+
 - Issue 5390: Add uninstall icon independent of whether file
   extensions are installed.
 

Modified: python/branches/release31-maint/setup.py
==============================================================================
--- python/branches/release31-maint/setup.py	(original)
+++ python/branches/release31-maint/setup.py	Fri Jul  3 01:57:11 2009
@@ -1605,12 +1605,11 @@
 
     def set_dir_modes(self, dirname, mode):
         if not self.is_chmod_supported(): return
-        os.walk(dirname, self.set_dir_modes_visitor, mode)
-
-    def set_dir_modes_visitor(self, mode, dirname, names):
-        if os.path.islink(dirname): return
-        log.info("changing mode of %s to %o", dirname, mode)
-        if not self.dry_run: os.chmod(dirname, mode)
+        for dirpath, dirnames, fnames in os.walk(dirname):
+            if os.path.islink(dirpath):
+                continue
+            log.info("changing mode of %s to %o", dirpath, mode)
+            if not self.dry_run: os.chmod(dirpath, mode)
 
     def is_chmod_supported(self):
         return hasattr(os, 'chmod')