From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Mar 2008 09:21:51 +0000 (-0000)
Subject: Bug #210449 - Reset exeinto(), docinto(), insinto(), and into() state
X-Git-Tag: v2.1.5~357
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0865a475dcd13d996fa9a40d74db590040abb4d2;p=portage.git

Bug #210449 - Reset exeinto(), docinto(), insinto(), and into() state
variables in case the user is running the install phase multiple times
consecutively via the ebuild command. (trunk r9357)

svn path=/main/branches/2.1.2/; revision=9531
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3cf834f6b..23d0b619a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -966,6 +966,15 @@ dyn_install() {
 	#some packages uses an alternative to $S to build in, cause
 	#our libtool to create problematic .la files
 	export PWORKDIR="$WORKDIR"
+
+	# Reset exeinto(), docinto(), insinto(), and into() state variables
+	# in case the user is running the install phase multiple times
+	# consecutively via the ebuild command.
+	export DESTTREE=/usr
+	export INSDESTTREE=""
+	export _E_EXEDESTTREE_=""
+	export _E_DOCDESTTREE_=""
+
 	ebuild_phase src_install
 	touch "${PORTAGE_BUILDDIR}/.installed"
 	vecho ">>> Completed installing ${PF} into ${D}"