1 |
On 09/27/2015 06:24 AM, Mike Gilbert wrote: |
2 |
> This reverts commit 0dc7b2a3923508896cf217f325b8339d73353553. |
3 |
> |
4 |
> The "optimized" chmod is no longer recursive, which causes files to be |
5 |
> missed. |
6 |
> |
7 |
> X-Gentoo-Bug: 561368 |
8 |
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=561368 |
9 |
> --- |
10 |
> bin/phase-helpers.sh | 4 ++-- |
11 |
> 1 file changed, 2 insertions(+), 2 deletions(-) |
12 |
> |
13 |
> diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
14 |
> index b446060..efd2cfa 100644 |
15 |
> --- a/bin/phase-helpers.sh |
16 |
> +++ b/bin/phase-helpers.sh |
17 |
> @@ -531,8 +531,8 @@ unpack() { |
18 |
> done |
19 |
> # Do not chmod '.' since it's probably ${WORKDIR} and PORTAGE_WORKDIR_MODE |
20 |
> # should be preserved. |
21 |
> - find . -mindepth 1 '!' -type l '!' -perm /a+rX,u+w,g-w,o-w \ |
22 |
> - -exec chmod -f a+rX,u+w,g-w,o-w '{}' + |
23 |
> + find . -mindepth 1 -maxdepth 1 ! -type l -print0 | \ |
24 |
> + ${XARGS} -0 chmod -fR a+rX,u+w,g-w,o-w |
25 |
> } |
26 |
> |
27 |
> econf() { |
28 |
> |
29 |
|
30 |
LGTM. |
31 |
|
32 |
Unfortunately, the find call in the 'optimized' version is useless, |
33 |
because it fails like this: |
34 |
|
35 |
$ find . -mindepth 1 '!' -type l '!' -perm /a+rX,u+w,g-w,o-w |
36 |
find: `./mod_auth_token': Permission denied |
37 |
|
38 |
Meanwhile, chmod -R works fine. |
39 |
-- |
40 |
Thanks, |
41 |
Zac |