* [gentoo-commits] proj/portage:master commit in: bin/
@ 2015-11-24 1:08 99% Zac Medico
0 siblings, 0 replies; 1+ results
From: Zac Medico @ 2015-11-24 1:08 UTC (permalink / raw
To: gentoo-commits
commit: dddeca6e4409e2a8a0dedc907d208ce352a48b72
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 00:59:37 2015 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 01:05:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=dddeca6e
einstalldocs: use lazy docinto calls (bug 566654)
This avoids unnecessary creation of an empty documentation directory.
X-Gentoo-Bug: 566654
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=566654
bin/phase-helpers.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index f42f805..80f5946 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -954,26 +954,26 @@ fi
if ___eapi_has_einstalldocs; then
einstalldocs() {
(
- docinto .
if ! declare -p DOCS &>/dev/null ; then
local d
for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
THANKS BUGS FAQ CREDITS CHANGELOG ; do
- [[ -s ${d} ]] && dodoc "${d}"
+ [[ -s ${d} ]] && docinto / && dodoc "${d}"
done
elif [[ $(declare -p DOCS) == "declare -a"* ]] ; then
- [[ ${DOCS[@]} ]] && dodoc -r "${DOCS[@]}"
+ [[ ${DOCS[@]} ]] && docinto / && dodoc -r "${DOCS[@]}"
else
- [[ ${DOCS} ]] && dodoc -r ${DOCS}
+ [[ ${DOCS} ]] && docinto / && dodoc -r ${DOCS}
fi
)
(
- docinto html
if [[ $(declare -p HTML_DOCS 2>/dev/null) == "declare -a"* ]] ; then
- [[ ${HTML_DOCS[@]} ]] && dodoc -r "${HTML_DOCS[@]}"
+ [[ ${HTML_DOCS[@]} ]] && \
+ docinto html && dodoc -r "${HTML_DOCS[@]}"
else
- [[ ${HTML_DOCS} ]] && dodoc -r ${HTML_DOCS}
+ [[ ${HTML_DOCS} ]] && \
+ docinto html && dodoc -r ${HTML_DOCS}
fi
)
}
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-11-24 1:08 99% [gentoo-commits] proj/portage:master commit in: bin/ Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox