From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 16 Nov 2007 06:16:15 +0000 (-0000)
Subject: Don't export ${IMAGE} to the ebuild environment anymore since
X-Git-Tag: v2.2_pre1~387
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e0d365e167ee363f542393ca6f1d8c7b3454ccf;p=portage.git

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 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"])