[PATCH] doins: Fix directory install options when called as dodoc.

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] doins: Fix directory install options when called as dodoc.

Ulrich Mueller-2
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 <[hidden email]>
---
 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

signature.asc (497 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] doins: Fix directory install options when called as dodoc.

Zac Medico-2
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 <[hidden email]>
> ---
>  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


signature.asc (1000 bytes) Download Attachment