Move the fake $HOME that's used for ebuilds from $PORTAGE_TMPDIR/portage/homedir...
authorZac Medico <zmedico@gentoo.org>
Mon, 8 May 2006 01:28:20 +0000 (01:28 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 8 May 2006 01:28:20 +0000 (01:28 -0000)
svn path=/main/trunk/; revision=3330

bin/ebuild.sh
pym/portage.py

index 8461af60897c872cf4ce6f2878c7256c813cdc84..70fffc1ba7decf4cd8462b7e7f1c650f20de57bc 100755 (executable)
@@ -719,7 +719,7 @@ dyn_clean() {
                chflags -R nosunlnk,nouunlnk "${PORTAGE_BUILDDIR}" 2>/dev/null
        fi
 
-       rm -rf "${PORTAGE_BUILDDIR}/image"
+       rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir"
 
        if ! hasq keeptemp $FEATURES; then
                rm -rf "${T}"
index 0d9a0e5afe8da3dc8194e05e802dbbc7e75698b3..177c78edaff85752c2c95cd5e1ecbb205cf8a532 100644 (file)
@@ -2462,7 +2462,6 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
 
 
        mysettings["BUILD_PREFIX"] = mysettings["PORTAGE_TMPDIR"]+"/portage"
-       mysettings["HOME"]         = mysettings["BUILD_PREFIX"]+"/homedir"
        mysettings["PKG_TMPDIR"]   = mysettings["PORTAGE_TMPDIR"]+"/binpkgs"
        
        # Package {pre,post}inst and {pre,post}rm may overlap, so they must have separate
@@ -2472,6 +2471,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
        else:
                mysettings["PORTAGE_BUILDDIR"] = os.path.join(mysettings["BUILD_PREFIX"], mysettings["PF"])
 
+       mysettings["HOME"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "homedir")
        mysettings["WORKDIR"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "work")
        mysettings["D"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "image") + os.sep
        mysettings["T"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "temp")