diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-16 06:16:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-16 06:16:15 +0000 |
| commit | 8e0d365e167ee363f542393ca6f1d8c7b3454ccf (patch) | |
| tree | 1bbcf148a7ff247845e81b1ed2fd888642b51870 /pym | |
| parent | 5e5a03529ebe36fdeffc26d8f9810044a9f72c6d (diff) | |
| download | portage-8e0d365e167ee363f542393ca6f1d8c7b3454ccf.tar.gz portage-8e0d365e167ee363f542393ca6f1d8c7b3454ccf.tar.bz2 portage-8e0d365e167ee363f542393ca6f1d8c7b3454ccf.zip | |
Don't export ${IMAGE} to the ebuild environment anymore since
everything uses ${D} now (including the entire tree).
svn path=/main/trunk/; revision=8512
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 6c368365e..57ba5ce0a 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4183,7 +4183,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, filemode=060, filemask=0) return retval elif mydo == "preinst": - mysettings["IMAGE"] = mysettings["D"] phase_retval = spawn(" ".join((EBUILD_SH_BINARY, mydo)), mysettings, debug=debug, free=1, logfile=logfile) if phase_retval == os.EX_OK: @@ -4198,7 +4197,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, if phase_retval != os.EX_OK: writemsg("!!! post preinst failed; exiting.\n", noiselevel=-1) - del mysettings["IMAGE"] return phase_retval elif mydo == "postinst": mysettings.load_infodir(mysettings["O"]) |