Remove duplicate realpath call for PORTAGE_TMPDIR.
authorZac Medico <zmedico@gentoo.org>
Sat, 21 Aug 2010 00:44:56 +0000 (17:44 -0700)
committerZac Medico <zmedico@gentoo.org>
Sat, 21 Aug 2010 00:44:56 +0000 (17:44 -0700)
pym/portage/package/ebuild/doebuild.py

index 699fbc5bd149ee4e02eff30e3026b1a77a59985f..21f716beb15cd0cdb1fbb9504c97ec90598047e9 100644 (file)
@@ -163,7 +163,8 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None,
                        mysettings.setcpv(mycpv, mydb=mydbapi)
 
        # config.reset() might have reverted a change made by the caller,
-       # so restore it to it's original value.
+       # so restore it to it's original value. Sandbox needs cannonical
+       # paths, so realpath it.
        mysettings["PORTAGE_TMPDIR"] = os.path.realpath(tmpdir)
 
        mysettings.pop("EBUILD_PHASE", None) # remove from backupenv
@@ -250,9 +251,6 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None,
        if portage_bin_path not in mysplit:
                mysettings["PATH"] = portage_bin_path + ":" + mysettings["PATH"]
 
-       # Sandbox needs cannonical paths.
-       mysettings["PORTAGE_TMPDIR"] = os.path.realpath(
-               mysettings["PORTAGE_TMPDIR"])
        mysettings["BUILD_PREFIX"] = mysettings["PORTAGE_TMPDIR"]+"/portage"
        mysettings["PKG_TMPDIR"]   = mysettings["PORTAGE_TMPDIR"]+"/binpkgs"