From: Zac Medico Date: Sat, 21 Aug 2010 00:44:56 +0000 (-0700) Subject: Remove duplicate realpath call for PORTAGE_TMPDIR. X-Git-Tag: v2.2_rc68~46 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8629922d34761b1188627938a7d0876af5931242;p=portage.git Remove duplicate realpath call for PORTAGE_TMPDIR. --- diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 699fbc5bd..21f716beb 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -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"