diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-20 17:44:56 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-20 17:44:56 -0700 |
| commit | 8629922d34761b1188627938a7d0876af5931242 (patch) | |
| tree | 32c75a1c24b3d761ff7e8049d77fb383c689b723 | |
| parent | c32aee053541993a3b7be732798976ed20faba69 (diff) | |
| download | portage-8629922d34761b1188627938a7d0876af5931242.tar.gz portage-8629922d34761b1188627938a7d0876af5931242.tar.bz2 portage-8629922d34761b1188627938a7d0876af5931242.zip | |
Remove duplicate realpath call for PORTAGE_TMPDIR.
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 6 |
1 files changed, 2 insertions, 4 deletions
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" |