vapier 15/05/04 05:43:08 Modified: toolchain.eclass Log: call die in more places to catch bad sed/mv commands
Revision Changes Path 1.666 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.666&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.666&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.665&r2=1.666 Index: toolchain.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.665 retrieving revision 1.666 diff -u -r1.665 -r1.666 --- toolchain.eclass 23 Apr 2015 19:17:19 -0000 1.665 +++ toolchain.eclass 4 May 2015 05:43:08 -0000 1.666 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.665 2015/04/23 19:17:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.666 2015/05/04 05:43:08 vapier Exp $ # Maintainer: Toolchain Ninjas <[email protected]> @@ -1784,7 +1784,7 @@ if [[ ${FROMDIR} != "${TODIR}" && -d ${FROMDIR} ]] ; then local files=$(find "${FROMDIR}" -maxdepth 1 ! -type d 2>/dev/null) if [[ -n ${files} ]] ; then - mv ${files} "${TODIR}" + mv ${files} "${TODIR}" || die fi fi done @@ -1794,7 +1794,7 @@ FROMDIR="${PREFIX}/lib/${OS_MULTIDIR}" for x in "${D}${FROMDIR}"/pkgconfig/libgcj*.pc ; do [[ -f ${x} ]] || continue - sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}" + sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}" || die mv "${x}" "${D}${FROMDIR}"/pkgconfig/libgcj-${GCC_PV}.pc || die done done @@ -1823,11 +1823,11 @@ sed -i \ -e "/^libdir=/s:=.*:='${dir}':" \ - ./${dir}/*.la + ./${dir}/*.la || die sed -i \ -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \ $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \ - ./${dir}/*.la + ./${dir}/*.la || die popd >/dev/null }
