[gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/

[Michał Górny]

commit:     4c2d9475fe14a8947f4f552a1be0b101bb1eef96
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 27 20:50:53 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 27 20:50:53 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=4c2d9475

prepare_build_dirs: Fix copytree() on Python 3.7

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 lib/portage/package/ebuild/prepare_build_dirs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py 
b/lib/portage/package/ebuild/prepare_build_dirs.py
index 2e2ef73f4..f37c9647b 100644
--- a/lib/portage/package/ebuild/prepare_build_dirs.py
+++ b/lib/portage/package/ebuild/prepare_build_dirs.py
@@ -483,9 +483,9 @@ def _prepare_fake_filesdir(settings):
     portage.util.ensure_dirs(filesdir, mode=0o755)
 
     # Copy files from real directory to ebuild directory (without metadata).
-    if os.path.isdir(real_filesdir):
+    if os.path.isdir(real_filesdir) and not os.path.isdir(filesdir):
         shutil.copytree(
-            real_filesdir, filesdir, copy_function=copyfile, dirs_exist_ok=True
+            real_filesdir, filesdir, copy_function=copyfile
         )