From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 Jun 2006 23:57:26 +0000 (-0000)
Subject: Skip the install phase when ${PORTAGE_BUILDDIR}/.installed exists.  See bug #137864.
X-Git-Tag: v2.1.1~394
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=502b0b9ff911eb31342b6d50c8130e44d028da78;p=portage.git

Skip the install phase when ${PORTAGE_BUILDDIR}/.installed exists.  See bug #137864.

svn path=/main/trunk/; revision=3646
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 651fdecb3..73fe3a4fd 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -996,6 +996,11 @@ dyn_test() {
 
 dyn_install() {
 	[ -z "$PORTAGE_BUILDDIR" ] && die "${FUNCNAME}: PORTAGE_BUILDDIR is unset"
+	if [ "${PORTAGE_BUILDDIR}/.installed" -nt "${WORKDIR}" ]; then
+		vecho ">>> It appears that '${PF}' is already installed; skipping."
+		vecho ">>> Remove '${PORTAGE_BUILDDIR}/.installed' to force install."
+		return 0
+	fi
 	trap "abort_install" SIGINT SIGQUIT
 	[ "$(type -t pre_src_install)" == "function" ] && pre_src_install
 	rm -rf "${PORTAGE_BUILDDIR}/image"