From: Arfrever Frehtes Taifersar Arahesis Date: Tue, 21 Feb 2017 18:45:20 +0000 (+0100) Subject: subversion.eclass: Fix error messages in subversion_bootstrap() and subversion_src_pr... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b51b539c994b83a1f125ef1ac3c9ff010ab9cc88;p=gentoo.git subversion.eclass: Fix error messages in subversion_bootstrap() and subversion_src_prepare(). ${FUNCNAME[1]} is name of direct parent function, but name of current function (${FUNCNAME[0]} or ${FUNCNAME}) is needed here. --- diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index 766c3f722446..439960379bf9 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -367,7 +367,7 @@ subversion_fetch() { # Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified. # Removed in EAPI 6 and later. subversion_bootstrap() { - [[ ${EAPI} == [012345] ]] || die "${FUNCNAME[1]} is removed from subversion.eclass in EAPI 6 and later" + [[ ${EAPI} == [012345] ]] || die "${FUNCNAME} is removed from subversion.eclass in EAPI 6 and later" if has "export" ${ESVN_RESTRICT}; then return @@ -447,7 +447,7 @@ subversion_src_unpack() { # Default src_prepare. Bootstrap. # Removed in EAPI 6 and later. subversion_src_prepare() { - [[ ${EAPI} == [012345] ]] || die "${FUNCNAME[1]} is removed from subversion.eclass in EAPI 6 and later" + [[ ${EAPI} == [012345] ]] || die "${FUNCNAME} is removed from subversion.eclass in EAPI 6 and later" subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." }