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

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

svn path=/main/trunk/; revision=8759
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 43049fc94..9fff41623 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2561,6 +2561,13 @@ class config(object):
 			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):