| 1 |
commit: cc7d98cec7b410d875d44a5130b22960746aca06 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 28 11:19:20 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 28 11:19:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc7d98ce |
| 7 |
|
| 8 |
Revert "prepare_build_dirs: Fix copytree() on Python 3.7" |
| 9 |
|
| 10 |
This is (obviously) the wrong fix, resulting in empty FILESDIR. |
| 11 |
|
| 12 |
Reverts: 4c2d9475fe14a8947f4f552a1be0b101bb1eef96 |
| 13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 14 |
|
| 15 |
lib/portage/package/ebuild/prepare_build_dirs.py | 2 +- |
| 16 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py |
| 19 |
index 7407122ca..0ae93a1d5 100644 |
| 20 |
--- a/lib/portage/package/ebuild/prepare_build_dirs.py |
| 21 |
+++ b/lib/portage/package/ebuild/prepare_build_dirs.py |
| 22 |
@@ -483,7 +483,7 @@ def _prepare_fake_filesdir(settings): |
| 23 |
portage.util.ensure_dirs(filesdir, mode=0o755) |
| 24 |
|
| 25 |
# Copy files from real directory to ebuild directory (without metadata). |
| 26 |
- if os.path.isdir(real_filesdir) and not os.path.isdir(filesdir): |
| 27 |
+ if os.path.isdir(real_filesdir): |
| 28 |
shutil.copytree(real_filesdir, filesdir, copy_function=copyfile) |
| 29 |
apply_recursive_permissions( |
| 30 |
filesdir, |
Archives