Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/
Date: Tue, 28 Sep 2021 07:21:30
Message-Id: 1632813587.6b2f67eddf66eb685cccfad3bec23147f318f420.zmedico@gentoo
1 commit: 6b2f67eddf66eb685cccfad3bec23147f318f420
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 28 00:17:05 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 28 07:19:47 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6b2f67ed
7
8 prepare_build_dirs: apply permissions to filesdir
9
10 Bug: https://bugs.gentoo.org/815196
11 Reviewed-by: Michał Górny <mgorny <AT> gentoo.org>
12 Reviewed-by: Sam James <sam <AT> gentoo.org>
13 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
14
15 lib/portage/package/ebuild/prepare_build_dirs.py | 11 +++++++++--
16 1 file changed, 9 insertions(+), 2 deletions(-)
17
18 diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py
19 index f37c9647b..7407122ca 100644
20 --- a/lib/portage/package/ebuild/prepare_build_dirs.py
21 +++ b/lib/portage/package/ebuild/prepare_build_dirs.py
22 @@ -484,8 +484,15 @@ def _prepare_fake_filesdir(settings):
23
24 # Copy files from real directory to ebuild directory (without metadata).
25 if os.path.isdir(real_filesdir) and not os.path.isdir(filesdir):
26 - shutil.copytree(
27 - real_filesdir, filesdir, copy_function=copyfile
28 + shutil.copytree(real_filesdir, filesdir, copy_function=copyfile)
29 + apply_recursive_permissions(
30 + filesdir,
31 + uid=portage_uid,
32 + gid=portage_gid,
33 + dirmode=0o750,
34 + dirmask=0,
35 + filemode=0o640,
36 + filemask=0,
37 )