Don't export ${IMAGE} to the ebuild environment anymore since

everything uses ${D} now (including the entire tree).

svn path=/main/trunk/; revision=8512

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 6c368365e699e4a5d0f065c90e5a7c51812e22a3..57ba5ce0ab15f57b0a0d1e19ab5593823fd87d1f 100644 (file)
--- 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"])