[Python-checkins] r86245 - in python/branches/release31-maint: Lib/distutils/dir_util.py Misc/NEWS

[eric.araujo]

Author: eric.araujo
Date: Sat Nov  6 05:51:10 2010
New Revision: 86245

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

........
  r86244 | eric.araujo | 2010-11-06 05:48:05 +0100 (sam., 06 nov. 2010) | 3 lines
  
  Prevent race condition with mkdir in distutils.  Patch by Arfrever on #9281.
........


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

Modified: python/branches/release31-maint/Lib/distutils/dir_util.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/dir_util.py	(original)
+++ python/branches/release31-maint/Lib/distutils/dir_util.py	Sat Nov  6 05:51:10 2010
@@ -69,10 +69,11 @@
         if not dry_run:
             try:
                 os.mkdir(head, mode)
-                created_dirs.append(head)
             except OSError as exc:
-                raise DistutilsFileError(
-                      "could not create '%s': %s" % (head, exc.args[-1]))
+                if not (exc.errno == errno.EEXIST and os.path.isdir(head)):
+                    raise DistutilsFileError(
+                          "could not create '%s': %s" % (head, exc.args[-1]))
+            created_dirs.append(head)
 
         _path_created[abs_head] = 1
     return created_dirs

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sat Nov  6 05:51:10 2010
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #9281: Prevent race condition with mkdir in distutils.  Patch by
+  Arfrever.
+
 - Issue #10229: Fix caching error in gettext.
 
 - Issue #10252: Close file objects in a timely manner in distutils code and