Skip to content

Commit

Permalink
fix crash in copy() with relative paths (#15647)
Browse files Browse the repository at this point in the history
  • Loading branch information
memsharded authored Feb 12, 2024
1 parent aa68541 commit ea84074
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
5 changes: 4 additions & 1 deletion conan/tools/files/copy_pattern.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ def _copy_files(files, src, dst, keep_path):
abs_src_name = os.path.join(src, filename)
filename = filename if keep_path else os.path.basename(filename)
abs_dst_name = os.path.normpath(os.path.join(dst, filename))
os.makedirs(os.path.dirname(abs_dst_name), exist_ok=True)
parent_folder = os.path.dirname(abs_dst_name)
if parent_folder: # There are cases where this folder will be empty for relative paths
os.makedirs(parent_folder, exist_ok=True)

if os.path.islink(abs_src_name):
linkto = os.readlink(abs_src_name) # @UndefinedVariable
try:
Expand Down
11 changes: 10 additions & 1 deletion conans/test/unittests/tools/files/test_tool_copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from conan.tools.files import copy
from conans.test.utils.test_files import temp_folder
from conans.util.files import load, save, mkdir, save_files
from conans.util.files import load, save, mkdir, save_files, chdir


class ToolCopyTest(unittest.TestCase):
Expand Down Expand Up @@ -275,3 +275,12 @@ def test_ignore_case_excludes(self):
sorted(os.listdir(os.path.join(dst_folder, "include"))))
self.assertEqual(sorted(["AttributeStorage.h", "file.h"]),
sorted(os.listdir(os.path.join(dst_folder, "include", "sub"))))

def test_empty_parent_folder_makedirs(self):
src_folder = temp_folder()
save(os.path.join(src_folder, "file.h"), "")
sources = os.path.join(src_folder, "src")
os.makedirs(sources)
with chdir(sources):
copy(None, "*", "..", dst=".") # This used to crash
assert "file.h" in os.listdir(sources)

0 comments on commit ea84074

Please sign in to comment.