Re: [gentoo-portage-dev] [PATCH] pre/post phase hooks for users

[Brian Harring]

On Wed, Oct 26, 2005 at 11:38:00AM +0200, Thomas Matthijs wrote:
If you're doing up a 53_rc7, I'd be curious if anyone is going to have 
issues with this one sliding into .53; it's a shoe in for .54 (it's 
bloody simple, mainly), but .54 is going to be a ways out, and this is 
useful _now_ for ebuild devs.

Yay/nay?
~harring

> Corrected patch
>
> --
>  Thomas Matthijs (axxo, knu)

> Index: ebuild.sh
> ===================================================================
> --- bin/ebuild.sh	(revision 2122)
> +++ bin/ebuild.sh	(working copy)
> @@ -631,11 +631,14 @@
>
>  dyn_setup()
>  {
> +	[ "$(type -t pre_pkg_setup)" == "function" ] && pre_pkg_setup
>  	pkg_setup
> +	[ "$(type -t post_pkg_setup)" == "function" ] && post_pkg_setup
>  }
>
>  dyn_unpack() {
>  	trap "abort_unpack" SIGINT SIGQUIT
> +	[ "$(type -t pre_src_unpack)" == "function" ] && pre_src_unpack
>  	local newstuff="no"
>  	if [ -e "${WORKDIR}" ]; then
>  		local x
> @@ -662,6 +665,7 @@
>  	if [ -e "${WORKDIR}" ]; then
>  		if [ "$newstuff" == "no" ]; then
>  			echo ">>> WORKDIR is up-to-date, keeping..."
> +			[ "$(type -t post_src_unpack)" == "function" ] && post_src_unpack
>  			return 0
>  		fi
>  	fi
> @@ -673,6 +677,9 @@
>  	touch "${BUILDDIR}/.unpacked" || die "IO Failure -- Failed 'touch .unpacked' in BUILDIR"
>  	echo ">>> Source unpacked."
>  	cd "$BUILDDIR"
> +
> +	[ "$(type -t post_src_unpack)" == "function" ] && post_src_unpack
> +
>  	trap SIGINT SIGQUIT
>  }
>
> @@ -854,6 +861,9 @@
>
>  dyn_compile() {
>  	trap "abort_compile" SIGINT SIGQUIT
> +
> +	[ "$(type -t pre_src_compile)" == "function" ] && pre_src_compile
> +
>  	[ "${CFLAGS-unset}"      != "unset" ] && export CFLAGS
>  	[ "${CXXFLAGS-unset}"    != "unset" ] && export CXXFLAGS
>  	[ "${LIBCFLAGS-unset}"   != "unset" ] && export LIBCFLAGS
> @@ -892,6 +902,7 @@
>  		echo ">>> It appears that ${PN} is already compiled; skipping."
>  		echo ">>> (clean to force compilation)"
>  		trap SIGINT SIGQUIT
> +		[ "$(type -t post_src_compile)" == "function" ] && post_src_compile
>  		return
>  	fi
>  	if [ -d "${S}" ]; then
> @@ -948,6 +959,9 @@
>  	if hasq nostrip $FEATURES $RESTRICT; then
>  		touch DEBUGBUILD
>  	fi
> +
> +	[ "$(type -t post_src_compile)" == "function" ] && post_src_compile
> +
>  	trap SIGINT SIGQUIT
>  }
>
> @@ -972,8 +986,10 @@
>
>
>  dyn_test() {
> +	[ "$(type -t pre_src_test)" == "function" ] && pre_src_test
>  	if [ ${BUILDDIR}/.tested -nt "${WORKDIR}" ]; then
>  		echo ">>> It appears that ${PN} has already been tested; skipping."
> +		[ "$(type -t post_src_test)" == "function" ] && post_src_test
>  		return
>  	fi
>  	trap "abort_test" SIGINT SIGQUIT
> @@ -992,6 +1008,7 @@
>
>  	cd "${BUILDDIR}"
>  	touch .tested || die "Failed to 'touch .tested' in ${BUILDDIR}"
> +	[ "$(type -t post_src_test)" == "function" ] && post_src_test
>  	trap SIGINT SIGQUIT
>  }
>
> @@ -1001,6 +1018,7 @@
>
>  dyn_install() {
>  	trap "abort_install" SIGINT SIGQUIT
> +	[ "$(type -t pre_src_install)" == "function" ] && pre_src_install
>  	rm -rf "${BUILDDIR}/image"
>  	mkdir "${BUILDDIR}/image"
>  	if [ -d "${S}" ]; then
> @@ -1204,6 +1222,7 @@
>  	echo ">>> Completed installing ${PF} into ${D}"
>  	echo
>  	cd ${BUILDDIR}
> +	[ "$(type -t post_src_install)" == "function" ] && post_src_install
>  	trap SIGINT SIGQUIT
>  }
>
> @@ -1211,6 +1230,8 @@
>  	# set IMAGE depending if this is a binary or compile merge
>  	[ "${EMERGE_FROM}" == "binary" ] && IMAGE=${PKG_TMPDIR}/${PF}/bin \
>  					|| IMAGE=${D}
> +
> +	[ "$(type -t pre_pkg_preinst)" == "function" ] && pre_pkg_preinst
>
>  	pkg_preinst
>
> @@ -1319,6 +1340,9 @@
>  			echo "!!! Unable to set SELinux security labels"
>  		fi
>  	fi
> +
> +	[ "$(type -t post_pkg_preinst)" == "function" ] && post_pkg_preinst
> +
>  	trap SIGINT SIGQUIT
>  }
>
> @@ -1845,11 +1869,15 @@
>  	prerm|postrm|postinst|config)
>  		export SANDBOX_ON="0"
>  		if [ "$PORTAGE_DEBUG" != "1" ]; then
> +			[ "$(type -t pre_pkg_${myarg})" == "function" ] && pre_pkg_${myarg}
>  			pkg_${myarg}
> +			[ "$(type -t post_pkg_${myarg})" == "function" ] && post_pkg_${myarg}
>  			#Allow non-zero return codes since they can be caused by &&
>  		else
>  			set -x
> +			[ "$(type -t pre_pkg_${myarg})" == "function" ] && pre_pkg_${myarg}
>  			pkg_${myarg}
> +			[ "$(type -t post_pkg_${myarg})" == "function" ] && post_pkg_${myarg}
>  			#Allow non-zero return codes since they can be caused by &&
>  			set +x
>  		fi