| 1 |
commit: 4c2d9475fe14a8947f4f552a1be0b101bb1eef96 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 27 20:50:53 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 27 20:50:53 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4c2d9475 |
| 7 |
|
| 8 |
prepare_build_dirs: Fix copytree() on Python 3.7 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
lib/portage/package/ebuild/prepare_build_dirs.py | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py |
| 16 |
index 2e2ef73f4..f37c9647b 100644 |
| 17 |
--- a/lib/portage/package/ebuild/prepare_build_dirs.py |
| 18 |
+++ b/lib/portage/package/ebuild/prepare_build_dirs.py |
| 19 |
@@ -483,9 +483,9 @@ def _prepare_fake_filesdir(settings): |
| 20 |
portage.util.ensure_dirs(filesdir, mode=0o755) |
| 21 |
|
| 22 |
# Copy files from real directory to ebuild directory (without metadata). |
| 23 |
- if os.path.isdir(real_filesdir): |
| 24 |
+ if os.path.isdir(real_filesdir) and not os.path.isdir(filesdir): |
| 25 |
shutil.copytree( |
| 26 |
- real_filesdir, filesdir, copy_function=copyfile, dirs_exist_ok=True |
| 27 |
+ real_filesdir, filesdir, copy_function=copyfile |
| 28 |
) |
Archives