From 0ec28b796d1206c4442f0269febe2a1cc0794411 Mon Sep 17 00:00:00 2001
From: Dawid Ciężarkiewicz <dpc@dpc.pw>
Date: Sat, 11 Mar 2017 08:04:30 -0800
Subject: Fix new version of `create_dir_all`

It will now correctly fail on existing non-directories.
---
 src/libstd/fs.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index bb8b4064fab..6a465e38f38 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -1777,7 +1777,7 @@ impl DirBuilder {
     fn create_dir_all(&self, path: &Path) -> io::Result<()> {
         match self.inner.mkdir(path) {
             Ok(()) => return Ok(()),
-            Err(ref e) if e.kind() == io::ErrorKind::AlreadyExists => return Ok(()),
+            Err(ref e) if e.kind() == io::ErrorKind::AlreadyExists && path.is_dir() => return Ok(()),
             Err(ref e) if e.kind() == io::ErrorKind::NotFound => {}
             Err(e) => return Err(e),
         }
@@ -1787,7 +1787,7 @@ impl DirBuilder {
         }
         match self.inner.mkdir(path) {
             Ok(()) => Ok(()),
-            Err(ref e) if e.kind() == io::ErrorKind::AlreadyExists => Ok(()),
+            Err(ref e) if e.kind() == io::ErrorKind::AlreadyExists && path.is_dir() => Ok(()),
             Err(e) => Err(e),
         }
     }
-- 
cgit 1.4.1-3-g733a5