Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions conan/internal/util/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ def remove(path):
def mkdir(path):
"""Recursive mkdir, doesnt fail if already existing"""
if os.path.exists(path):
if os.path.isfile(path):
raise ConanException("Cannot create folder: '{}'. "
"Path already exists and is not a folder.".format(path))
return
os.makedirs(path)

Expand Down
3 changes: 3 additions & 0 deletions conan/tools/files/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ def mkdir(conanfile, path):
:param path: Path to the folder to be created.
"""
if os.path.exists(path):
if os.path.isfile(path):
raise ConanException("Cannot create folder: '{}'. "
"Path already exists and is not a folder.".format(path))
return
os.makedirs(path)

Expand Down
21 changes: 21 additions & 0 deletions test/unittests/tools/files/test_mkdir.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import os
import pytest
from conan.errors import ConanException
from conan.test.utils.test_files import temp_folder
from conan.internal.util.files import save
from conan.tools.files import mkdir


def test_create_folder_with_same_file_name():
tmpdir = temp_folder()

save(os.path.join(tmpdir, "build"), "content")
with pytest.raises(ConanException, match="Path already exists and is not a folder"):
mkdir(None, os.path.join(tmpdir, "build"))

mkdir(None, os.path.join(tmpdir, "build_folder"))
mkdir(None, os.path.join(tmpdir, "build_folder", "build_folder2"))

assert os.path.isfile(os.path.join(tmpdir, "build"))
assert os.path.isdir(os.path.join(tmpdir, "build_folder"))
assert os.path.isdir(os.path.join(tmpdir, "build_folder", "build_folder2"))
20 changes: 20 additions & 0 deletions test/unittests/util/files/test_mkdir.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import os
import pytest
from conan.errors import ConanException
from conan.test.utils.test_files import temp_folder
from conan.internal.util.files import mkdir, save


def test_create_folder_with_same_file_name():
tmpdir = temp_folder()

save(os.path.join(tmpdir, "build"), "content")
with pytest.raises(ConanException, match="Path already exists and is not a folder"):
mkdir(os.path.join(tmpdir, "build"))

mkdir(os.path.join(tmpdir, "build_folder"))
mkdir(os.path.join(tmpdir, "build_folder", "build_folder2"))

assert os.path.isfile(os.path.join(tmpdir, "build"))
assert os.path.isdir(os.path.join(tmpdir, "build_folder"))
assert os.path.isdir(os.path.join(tmpdir, "build_folder", "build_folder2"))
Loading