For bug #187518, handle EISDIR thrown from mkdir when the directory already exists...

svn path=/main/trunk/; revision=7544

diff --git a/pym/portage/util.py b/pym/portage/util.py
index d10cb1d6aede299340624aadceb8a288d7eebaef..894ea44a0ffb122b41da4bf313ef3a3ebf54fa1e 100644 (file)
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -856,7 +856,7 @@ def ensure_dirs(dir_path, *args, **kwargs):
                created_dir = True
        except OSError, oe:
                func_call = "makedirs('%s')" % dir_path
-               if errno.EEXIST == oe.errno:
+               if oe.errno in (errno.EEXIST, errno.EISDIR):
                        pass
                elif oe.errno == errno.EPERM:
                        raise OperationNotPermitted(func_call)