diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py index 5a968063f7e..d6875936d62 100644 --- a/Lib/distutils/dir_util.py +++ b/Lib/distutils/dir_util.py @@ -69,10 +69,11 @@ def mkpath(name, mode=0777, verbose=1, dry_run=0): if not dry_run: try: os.mkdir(head, mode) - created_dirs.append(head) except OSError, exc: - raise DistutilsFileError, \ - "could not create '%s': %s" % (head, exc[-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 21552c137c5..1948498ccea 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -69,6 +69,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