aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2021-09-27 22:50:53 +0200
committerMichał Górny <mgorny@gentoo.org>2021-09-27 22:50:53 +0200
commit4c2d9475fe14a8947f4f552a1be0b101bb1eef96 (patch)
treed4da0fddb011d6f4155f0922ec5c878066968193
parenteend: Output QA notice when called without argument (diff)
downloadportage-4c2d9475.tar.gz
portage-4c2d9475.tar.bz2
portage-4c2d9475.zip
prepare_build_dirs: Fix copytree() on Python 3.7
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--lib/portage/package/ebuild/prepare_build_dirs.py4
1 files 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
)