diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-04-29 22:14:23 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-04-29 22:14:23 +0000 |
| commit | e0b854c906ea0af3a84e886cb187c91d6bd18ee8 (patch) | |
| tree | faa40af368286ff80e835fdaceef9f68ada66796 /eclass | |
| parent | Unmask ~media-libs/babl-0.1.10[introspection] (bug #413663) (diff) | |
| download | gentoo-2-e0b854c906ea0af3a84e886cb187c91d6bd18ee8.tar.gz gentoo-2-e0b854c906ea0af3a84e886cb187c91d6bd18ee8.tar.bz2 gentoo-2-e0b854c906ea0af3a84e886cb187c91d6bd18ee8.zip | |
Corrected UNIPATCH_DOCS functionality, a mistake slipped through testing and review, fixes bug #467916 reported by Alexandros Diamantidis.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index f126be231b15..ddd86367afb7 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.803 2013/04/28 18:59:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.804 2013/04/29 22:14:23 tomwij Exp $ + + 29 Apr 2013; Tom Wijsman <TomWij@gentoo.org> kernel-2.eclass: + Corrected UNIPATCH_DOCS functionality, this went unnoticed since + dodoc can be called without arguments in Portage. Thanks to the + Paludis user Alexandros Diamantidis in bug #467916 for reporting. 28 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org> autotools.eclass: Reverting autotools.eclass commit that broke eautoreconf (bug #467772), acked diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 4f48527557ed..f6d3db2d820e 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.283 2013/04/17 20:59:24 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.284 2013/04/29 22:14:23 tomwij Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -742,8 +742,10 @@ install_sources() { mv ${WORKDIR}/linux* "${D}"/usr/src - if [[ -z ${UNIPATCH_DOCS} ]] ; then - dodoc ${UNIPATCH_DOCS} + if [[ -n "${UNIPATCH_DOCS}" ]] ; then + for i in ${UNIPATCH_DOCS}; do + dodoc "${T}"/${i} + done fi } @@ -1040,7 +1042,7 @@ unipatch() { for x in ${KPATCH_DIR}; do for i in ${UNIPATCH_DOCS}; do if [[ -f "${x}/${i}" ]] ; then - tmp="${tmp} \"${T}/${i}\"" + tmp="${tmp} ${i}" cp -f "${x}/${i}" "${T}"/ fi done |