From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Dec 2007 18:21:50 +0000 (-0000)
Subject: Add PKGDIR to the config.environ() whitelist so that people's
X-Git-Tag: v2.1.4~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f722cd1398de873da0c80560c2248b6205a5aed8;p=portage.git

Add PKGDIR to the config.environ() whitelist so that people's
bashrc's don't break. (trunk r9114)

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

diff --git a/pym/portage.py b/pym/portage.py
index 569bc2ee4..4df9b64b2 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1009,6 +1009,7 @@ class config:
 		"EBUILD_EXIT_STATUS_FILE", "EBUILD_FORCE_TEST",
 		"EBUILD_PHASE", "ECLASSDIR", "ECLASS_DEPTH", "EMERGE_FROM",
 		"FEATURES", "FILESDIR", "HOME", "PATH",
+		"PKGDIR",
 		"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",
 		"PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST",
 		"PORTAGE_BASHRC",
@@ -2630,8 +2631,6 @@ class config:
 			phase = self.get("EBUILD_PHASE")
 			if phase:
 				whitelist = []
-				if "package" == phase:
-					whitelist.append("PKGDIR")
 				if "rpm" == phase:
 					whitelist.append("RPMDIR")
 				for k in whitelist: