summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst7
-rw-r--r--pkg_resources/py31compat.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 1bae3f25..487accd9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v36.1.1
+-------
+
+* #1083: Correct ``py31compat.makedirs`` to correctly honor
+ ``exist_ok`` parameter.
+* #1083: Also use makedirs compatibility throughout setuptools.
+
v36.1.0
-------
diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
index 28120cac..c6217af7 100644
--- a/pkg_resources/py31compat.py
+++ b/pkg_resources/py31compat.py
@@ -10,7 +10,7 @@ def _makedirs_31(path, exist_ok=False):
try:
os.makedirs(path)
except OSError as exc:
- if exc.errno != errno.EEXIST:
+ if not exist_ok or exc.errno != errno.EEXIST:
raise