diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-06-26 07:01:13 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-06-26 07:01:13 +0000 |
| commit | d1e92f39e5192a9de0b790a7ebbb5ec3dbf4a6df (patch) | |
| tree | 8a344a7979ef8e7a2c7ef7b755d53e7ac172a002 /eclass | |
| parent | Version bump (bug #514732). (diff) | |
| download | gentoo-2-d1e92f39e5192a9de0b790a7ebbb5ec3dbf4a6df.tar.gz gentoo-2-d1e92f39e5192a9de0b790a7ebbb5ec3dbf4a6df.tar.bz2 gentoo-2-d1e92f39e5192a9de0b790a7ebbb5ec3dbf4a6df.zip | |
Rename FILE_SUFFIX to README_GENTOO_SUFFIX in order to avoid variable clashes
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/readme.gentoo.eclass | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index b751555ad7c8..80d50570d779 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1299 2014/06/24 18:36:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1300 2014/06/26 07:01:13 jlec Exp $ + + 26 Jun 2014; Justin Lecher <jlec@gentoo.org> readme.gentoo.eclass, + waf-utils.eclass: + Rename FILE_SUFFIX to README_GENTOO_SUFFIX in order to avoid variable clashes 24 Jun 2014; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass: Allow to handle more README.gentoo files (#513190 by Justin Lecher) diff --git a/eclass/readme.gentoo.eclass b/eclass/readme.gentoo.eclass index 0afb6cf08ee3..27828dcc21c3 100644 --- a/eclass/readme.gentoo.eclass +++ b/eclass/readme.gentoo.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.9 2014/06/24 18:36:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.10 2014/06/26 07:01:13 jlec Exp $ # @ECLASS: readme.gentoo # @MAINTAINER: @@ -48,10 +48,10 @@ EXPORT_FUNCTIONS src_install pkg_postinst # @DESCRIPTION: # If non-empty this variable forces elog messages to be printed. -# @ECLASS-VARIABLE: FILE_SUFFIX +# @ECLASS-VARIABLE: README_GENTOO_SUFFIX # @DESCRIPTION: # If you want to specify a suffix for README.gentoo file please export it. -: ${FILE_SUFFIX:=""} +: ${README_GENTOO_SUFFIX:=""} # @FUNCTION: readme.gentoo_create_doc # @DESCRIPTION: @@ -75,7 +75,7 @@ readme.gentoo_create_doc() { elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die elif [[ -f "${FILESDIR}/README.gentoo" ]]; then - cp "${FILESDIR}/README.gentoo${FILE_SUFFIX}" "${T}"/README.gentoo || die + cp "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" "${T}"/README.gentoo || die else die "You are not specifying README.gentoo contents!" fi |