| 1 |
commit: 87193bc3da112b8bdb42a2698514fcb047cf6989 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 2 10:07:09 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 2 22:19:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=87193bc3 |
| 7 |
|
| 8 |
doins: Fix directory install options when called as dodoc. |
| 9 |
|
| 10 |
PMS does not mention that diropts should be respected when dodoc -r |
| 11 |
creates directories recursively. This is consistent with the behaviour |
| 12 |
for regular files, where insopts isn't respected either. |
| 13 |
|
| 14 |
A parallel patch for further clarification of the PMS wording has been |
| 15 |
sent to the gentoo-pms mailing list for review. |
| 16 |
|
| 17 |
Acked-by: Zac Medico <zmedico <AT> gentoo.org> |
| 18 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 19 |
|
| 20 |
bin/ebuild-helpers/doins | 3 ++- |
| 21 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins |
| 24 |
index fb5fc7c7c..24fe48121 100755 |
| 25 |
--- a/bin/ebuild-helpers/doins |
| 26 |
+++ b/bin/ebuild-helpers/doins |
| 27 |
@@ -1,5 +1,5 @@ |
| 28 |
#!/bin/bash |
| 29 |
-# Copyright 1999-2018 Gentoo Foundation |
| 30 |
+# Copyright 1999-2019 Gentoo Authors |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
| 34 |
@@ -15,6 +15,7 @@ if [[ ${helper} == dodoc ]] ; then |
| 35 |
exit 0 |
| 36 |
fi |
| 37 |
export INSOPTIONS=-m0644 |
| 38 |
+ export DIROPTIONS="" |
| 39 |
export _E_INSDESTTREE_=usr/share/doc/${PF}/${_E_DOCDESTTREE_} |
| 40 |
else |
| 41 |
if ! ___eapi_has_DESTTREE_INSDESTTREE; then |
Archives