From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 Nov 2007 07:21:13 +0000 (-0000)
Subject: Make config.environ() export PKGDIR to the ebuild environment
X-Git-Tag: v2.1.4~169
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec5473cd43f0c60455bb5c957cb74c1ef83e0a0e;p=portage.git

Make config.environ() export PKGDIR to the ebuild environment
during the "package" phase since it's currently referenced
there. (trunk r8759)

svn path=/main/branches/2.1.2/; revision=8760
---

diff --git a/pym/portage.py b/pym/portage.py
index b3d5baf7f..152cb3e24 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2545,6 +2545,13 @@ class config:
 			writemsg("*** HOME not set. Setting to "+mydict["BUILD_PREFIX"]+"\n")
 			mydict["HOME"]=mydict["BUILD_PREFIX"][:]
 
+		if filter_calling_env:
+			if "package" == self.get("EBUILD_PHASE"):
+				for k in ("PKGDIR", ):
+					v = self.get(k)
+					if v is not None:
+						mydict[k] = v
+
 		return mydict
 
 	def thirdpartymirrors(self):