Prevent race condition with mkdir in distutils. Patch by Arfrever on #9281.

diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py
index 54376e5ca5a3e726a070c81dd55ff12396c0b75c..c7c9fccfd79fb049d07df793b43c6d508f7e3ab4 100644 (file)
--- a/Lib/distutils/dir_util.py
+++ b/Lib/distutils/dir_util.py
@@ -69,10 +69,11 @@ def mkpath(name, mode=0o777, verbose=1, dry_run=0):
         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

diff --git a/Misc/NEWS b/Misc/NEWS
index 0d3867e7d5a27267e542c5ec27cb174aef1547a2..44458521e087e6143163289b8074f75e18a42c4e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,6 +65,9 @@ Core and Builtins
 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