aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2019-10-02 12:07:09 +0200
committerUlrich Müller <ulm@gentoo.org>2019-10-03 00:19:17 +0200
commit87193bc3da112b8bdb42a2698514fcb047cf6989 (patch)
tree8a63bdce8411db0dfa2d796963d3b6d96601a95e
parentman/ebuild.5: Improvements to the ebuild(5) man page (diff)
downloadportage-87193bc3da112b8bdb42a2698514fcb047cf6989.tar.gz
portage-87193bc3da112b8bdb42a2698514fcb047cf6989.tar.bz2
portage-87193bc3da112b8bdb42a2698514fcb047cf6989.zip
doins: Fix directory install options when called as dodoc.
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. Acked-by: Zac Medico <zmedico@gentoo.org> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rwxr-xr-xbin/ebuild-helpers/doins3
1 files changed, 2 insertions, 1 deletions
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