diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-02-19 05:59:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-19 05:59:44 +0000 |
| commit | a0e41c6e4574f26e65b6dc4edbc583bb12b58467 (patch) | |
| tree | 18207949f23f805582bbecdf96790cffca600d81 | |
| parent | 7585d95ced3661d3e25f6dd8df16fe116ae4bccb (diff) | |
| download | portage-a0e41c6e4574f26e65b6dc4edbc583bb12b58467.tar.gz portage-a0e41c6e4574f26e65b6dc4edbc583bb12b58467.tar.bz2 portage-a0e41c6e4574f26e65b6dc4edbc583bb12b58467.zip | |
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.
svn path=/main/trunk/; revision=9357
| -rwxr-xr-x | bin/ebuild.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 0c9a6760a..2f48e76e7 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -263,10 +263,6 @@ register_die_hook() { #if no perms are specified, dirs/files will have decent defaults #(not secretive, but not stupid) umask 022 -export DESTTREE=/usr -export INSDESTTREE="" -export _E_EXEDESTTREE_="" -export _E_DOCDESTTREE_="" export INSOPTIONS="-m0644" export EXEOPTIONS="-m0755" export LIBOPTIONS="-m0644" @@ -966,6 +962,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}" |