From: Mike Frysinger Date: Sat, 13 Jan 2007 19:36:14 +0000 (+0000) Subject: fix EBUILD_PHASE check in preserve_old_lib funcs X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e77f6f833bcbd601048da2bb143b58999954cd1d;p=gentoo.git fix EBUILD_PHASE check in preserve_old_lib funcs --- diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index ef903de41e58..57bcfb9b25cc 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.267 2007/01/09 15:47:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.268 2007/01/13 19:36:14 vapier Exp $ # # This eclass is for general purpose functions that most ebuilds # have to implement themselves. @@ -1551,7 +1551,7 @@ set_arch_to_portage() { # } preserve_old_lib() { - if [[ ${EBUILD_PHASE} != "pkg_preinst" ]] ; then + if [[ ${EBUILD_PHASE} != "preinst" ]] ; then eerror "preserve_old_lib() must be called from pkg_preinst() only" # die "Invalid preserve_old_lib() usage" fi @@ -1568,7 +1568,7 @@ preserve_old_lib() { } preserve_old_lib_notify() { - if [[ ${EBUILD_PHASE} != "pkg_postinst" ]] ; then + if [[ ${EBUILD_PHASE} != "postinst" ]] ; then eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" # die "Invalid preserve_old_lib_notify() usage" fi