[gentoo-portage-dev] [PATCH] Revert "unpack: avoid useless chmods to improve speed"

[gentoo-portage-dev] [PATCH] Revert "unpack: avoid useless chmods to improve speed"

[Mike Gilbert]

This reverts commit 0dc7b2a3923508896cf217f325b8339d73353553.

The "optimized" chmod is no longer recursive, which causes files to be
missed.

X-Gentoo-Bug: 561368
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=561368
---
 bin/phase-helpers.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index b446060..efd2cfa 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -531,8 +531,8 @@ unpack() {
 	done
 	# Do not chmod '.' since it's probably ${WORKDIR} and PORTAGE_WORKDIR_MODE
 	# should be preserved.
-	find . -mindepth 1 '!' -type l '!' -perm /a+rX,u+w,g-w,o-w \
-		-exec chmod -f a+rX,u+w,g-w,o-w '{}' +
+	find . -mindepth 1 -maxdepth 1 ! -type l -print0 | \
+		${XARGS} -0 chmod -fR a+rX,u+w,g-w,o-w
 }
 
 econf() {
-- 
2.5.3

Re: [gentoo-portage-dev] [PATCH] Revert "unpack: avoid useless chmods to improve speed"

[Zac Medico]

On 09/27/2015 06:24 AM, Mike Gilbert wrote:
> This reverts commit 0dc7b2a3923508896cf217f325b8339d73353553.
> 
> The "optimized" chmod is no longer recursive, which causes files to be
> missed.
> 
> X-Gentoo-Bug: 561368
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=561368
> ---
>  bin/phase-helpers.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
> index b446060..efd2cfa 100644
> --- a/bin/phase-helpers.sh
> +++ b/bin/phase-helpers.sh
> @@ -531,8 +531,8 @@ unpack() {
>  	done
>  	# Do not chmod '.' since it's probably ${WORKDIR} and PORTAGE_WORKDIR_MODE
>  	# should be preserved.
> -	find . -mindepth 1 '!' -type l '!' -perm /a+rX,u+w,g-w,o-w \
> -		-exec chmod -f a+rX,u+w,g-w,o-w '{}' +
> +	find . -mindepth 1 -maxdepth 1 ! -type l -print0 | \
> +		${XARGS} -0 chmod -fR a+rX,u+w,g-w,o-w
>  }
>  
>  econf() {
> 

LGTM.

Unfortunately, the find call in the 'optimized' version is useless,
because it fails like this:

$ find . -mindepth 1 '!' -type l '!' -perm /a+rX,u+w,g-w,o-w
find: `./mod_auth_token': Permission denied

Meanwhile, chmod -R works fine.
-- 
Thanks,
Zac

Re: [gentoo-portage-dev] [PATCH] Revert "unpack: avoid useless chmods to improve speed"

[Brian Dolbec]

On Mon, 28 Sep 2015 11:52:52 -0700
Zac Medico <zmedico@gentoo.org> wrote:

> On 09/27/2015 06:24 AM, Mike Gilbert wrote:
> > This reverts commit 0dc7b2a3923508896cf217f325b8339d73353553.
> > 
> > The "optimized" chmod is no longer recursive, which causes files to
> > be missed.
> > 
> > X-Gentoo-Bug: 561368
> > X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=561368
> > ---
> >  bin/phase-helpers.sh | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
> > index b446060..efd2cfa 100644
> > --- a/bin/phase-helpers.sh
> > +++ b/bin/phase-helpers.sh
> > @@ -531,8 +531,8 @@ unpack() {
> >  	done
> >  	# Do not chmod '.' since it's probably ${WORKDIR} and
> > PORTAGE_WORKDIR_MODE # should be preserved.
> > -	find . -mindepth 1 '!' -type l '!' -perm /a+rX,u+w,g-w,o-w
> > \
> > -		-exec chmod -f a+rX,u+w,g-w,o-w '{}' +
> > +	find . -mindepth 1 -maxdepth 1 ! -type l -print0 | \
> > +		${XARGS} -0 chmod -fR a+rX,u+w,g-w,o-w
> >  }
> >  
> >  econf() {
> > 
> 
> LGTM.
> 
> Unfortunately, the find call in the 'optimized' version is useless,
> because it fails like this:
> 
> $ find . -mindepth 1 '!' -type l '!' -perm /a+rX,u+w,g-w,o-w
> find: `./mod_auth_token': Permission denied
> 
> Meanwhile, chmod -R works fine.

Applied and pushed,

Thanks
-- 
Brian Dolbec <dolsen>