diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-11-06 04:51:10 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-11-06 04:51:10 (GMT) |
| commit | 1ca7556dd015fb60437142d583d7c31a397fabae (patch) | |
| tree | 8ab2362ead1ddb35fed00fa091965a74d77e4f7a /Lib | |
| parent | 1c1340b30a9d113b76818e52b5ed101c4867b79a (diff) | |
| download | cpython-1ca7556dd015fb60437142d583d7c31a397fabae.zip cpython-1ca7556dd015fb60437142d583d7c31a397fabae.tar.gz cpython-1ca7556dd015fb60437142d583d7c31a397fabae.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/dir_util.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py index 54376e5..c7c9fcc 100644 --- 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 |