public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-portage-dev] [PATCH] doins: Fix directory install options when called as dodoc.
@ 2019-10-02 10:07 Ulrich Müller
  2019-10-02 17:58 ` Zac Medico
  0 siblings, 1 reply; 2+ messages in thread
From: Ulrich Müller @ 2019-10-02 10:07 UTC (permalink / raw
  To: gentoo-portage-dev

[-- Attachment #1: Type: text/plain, Size: 1130 bytes --]

PMS does not mention that diropts should be respected when dodoc -r
creates directories recursively. This is consistent with the behaviour
for regular files, where insopts isn't respected either.

A parallel patch for further clarification of the PMS wording has been
sent to the gentoo-pms mailing list for review.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 bin/ebuild-helpers/doins | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index fb5fc7c7c..24fe48121 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -15,6 +15,7 @@ if [[ ${helper} == dodoc ]] ; then
 		exit 0
 	fi
 	export INSOPTIONS=-m0644
+	export DIROPTIONS=""
 	export _E_INSDESTTREE_=usr/share/doc/${PF}/${_E_DOCDESTTREE_}
 else
 	if ! ___eapi_has_DESTTREE_INSDESTTREE; then
-- 
2.23.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [gentoo-portage-dev] [PATCH] doins: Fix directory install options when called as dodoc.
  2019-10-02 10:07 [gentoo-portage-dev] [PATCH] doins: Fix directory install options when called as dodoc Ulrich Müller
@ 2019-10-02 17:58 ` Zac Medico
  0 siblings, 0 replies; 2+ messages in thread
From: Zac Medico @ 2019-10-02 17:58 UTC (permalink / raw
  To: gentoo-portage-dev, Ulrich Müller


[-- Attachment #1.1: Type: text/plain, Size: 1276 bytes --]

On 10/2/19 3:07 AM, Ulrich Müller wrote:
> PMS does not mention that diropts should be respected when dodoc -r
> creates directories recursively. This is consistent with the behaviour
> for regular files, where insopts isn't respected either.
> 
> A parallel patch for further clarification of the PMS wording has been
> sent to the gentoo-pms mailing list for review.
> 
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
>  bin/ebuild-helpers/doins | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
> index fb5fc7c7c..24fe48121 100755
> --- a/bin/ebuild-helpers/doins
> +++ b/bin/ebuild-helpers/doins
> @@ -1,5 +1,5 @@
>  #!/bin/bash
> -# Copyright 1999-2018 Gentoo Foundation
> +# Copyright 1999-2019 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>  
>  source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
> @@ -15,6 +15,7 @@ if [[ ${helper} == dodoc ]] ; then
>  		exit 0
>  	fi
>  	export INSOPTIONS=-m0644
> +	export DIROPTIONS=""
>  	export _E_INSDESTTREE_=usr/share/doc/${PF}/${_E_DOCDESTTREE_}
>  else
>  	if ! ___eapi_has_DESTTREE_INSDESTTREE; then
> 

Looks good. Please merge.
-- 
Thanks,
Zac


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-10-02 17:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-02 10:07 [gentoo-portage-dev] [PATCH] doins: Fix directory install options when called as dodoc Ulrich Müller
2019-10-02 17:58 ` Zac Medico

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox