copy() debug output

conan/tools/files/copy_pattern.py

@@ -37,6 +37,12 @@ def copy(conanfile, pattern, src, dst, keep_path=True, excludes=None,
 
     copied_files = _copy_files(files_to_copy, src, dst, keep_path)
     copied_files.extend(_copy_files_symlinked_to_folders(files_symlinked_to_folders, src, dst))
+    if conanfile:  # Some usages still pass None
+        copied = '\n    '.join(files_to_copy)
+        conanfile.output.debug(f"copy(pattern={pattern}) copied {len(copied_files)} files\n"
+                               f"  from {src}\n"
+                               f"  to {dst}\n"
+                               f"  Files:\n    {copied}")
     return copied_files
 
 
@@ -106,10 +112,7 @@ 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))
-        try:
-            os.makedirs(os.path.dirname(abs_dst_name))
-        except Exception:
-            pass
+        os.makedirs(os.path.dirname(abs_dst_name), exist_ok=True)
         if os.path.islink(abs_src_name):
             linkto = os.readlink(abs_src_name)  # @UndefinedVariable
             try:

conans/client/cmd/export.py

@@ -136,11 +136,9 @@ def export_source(conanfile, destination_source_folder):
         conanfile.exports_sources = (conanfile.exports_sources,)
 
     included_sources, excluded_sources = _classify_patterns(conanfile.exports_sources)
-    copied = []
     for pattern in included_sources:
-        _tmp = copy(conanfile, pattern, src=conanfile.recipe_folder,
-                    dst=destination_source_folder, excludes=excluded_sources)
-        copied.extend(_tmp)
+        copy(conanfile, pattern, src=conanfile.recipe_folder,
+             dst=destination_source_folder, excludes=excluded_sources)
 
     conanfile.folders.set_base_export_sources(destination_source_folder)
     _run_method(conanfile, "export_sources")
@@ -163,11 +161,9 @@ def export_recipe(conanfile, destination_folder):
 
     included_exports, excluded_exports = _classify_patterns(conanfile.exports)
 
-    copied = []
     for pattern in included_exports:
-        tmp = copy(conanfile, pattern, conanfile.recipe_folder, destination_folder,
-                   excludes=excluded_exports)
-        copied.extend(tmp)
+        copy(conanfile, pattern, conanfile.recipe_folder, destination_folder,
+             excludes=excluded_exports)
 
     conanfile.folders.set_base_export(destination_folder)
     _run_method(conanfile, "export")

conans/test/integration/command/export_pkg_test.py

@@ -126,7 +126,9 @@ def package(self):
                      "libs/what": "",
                      "lib/hello.lib": "My Lib",
                      "lib/bye.txt": ""}, clean_first=True)
-        client.run("export-pkg . --user=lasote --channel=stable -s os=Windows")
+        client.run("export-pkg . --user=lasote --channel=stable -s os=Windows -vvv")
+        assert "copy(pattern=*.h) copied 1 files" in client.out
+        assert "copy(pattern=*.lib) copied 1 files" in client.out
         package_folder = client.created_layout().package()
         inc = os.path.join(package_folder, "inc")
         self.assertEqual(os.listdir(inc), ["header.h"])

conans/test/unittests/source/merge_directories_test.py

@@ -5,7 +5,6 @@
 
 import pytest
 
-from conans.errors import ConanException
 from conans.test.utils.test_files import temp_folder
 from conans.util.files import mkdir, save, merge_directories, load
 
@@ -89,26 +88,3 @@ def test_parent_directory(self):
         self.assertEqual(load(join(self.dest, "file.txt")), "fromsrc")
         self.assertEqual(load(join(self.dest, "subdir2/file2.txt")), "fromdest")
         self.assertEqual(load(join(self.dest, "subdir/file2.txt")), "fromsrc")
-
-    def test_excluded_dirs(self):
-        files = ["file.txt", "subdir/file2.txt", "subdir/file3.txt", "other_dir/somefile.txt",
-                 "other_dir/somefile2.txt"]
-        self._save(self.source, files, "fromsrc")
-
-        files_dest = ["file.txt", "subdir2/file2.txt"]
-        self._save(self.dest, files_dest, "fromdest")
-
-        # Excluded one file from other_dir and the whole subdir
-        merge_directories(self.source, self.dest, excluded=["other_dir/somefile.txt", "subdir"])
-        self._assert_equals(self._get_paths(self.dest), ["file.txt",
-                                                         "subdir2/file2.txt",
-                                                         "other_dir/somefile2.txt"])
-
-        # Excluded one from dest (no sense) and one from origin
-        merge_directories(self.source, self.dest, excluded=["subdir2/file2.txt",
-                                                            "subdir",
-                                                            "other_dir/somefile.txt"])
-
-        self._assert_equals(self._get_paths(self.dest), ["file.txt",
-                                                         "subdir2/file2.txt",
-                                                         "other_dir/somefile2.txt"])

conans/util/files.py

@@ -294,9 +294,9 @@ def exception_message_safe(exc):
         return repr(exc)
 
 
-def merge_directories(src, dst, excluded=None):
+def merge_directories(src, dst):
     from conan.tools.files import copy
-    copy(None, pattern="*", src=src, dst=dst, excludes=excluded)
+    copy(None, pattern="*", src=src, dst=dst)
 
 
 def gather_files(folder):