summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-29 18:20:43 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-29 18:20:43 +0000
commitd4c853b91f13a320102ae87272f09885857a87cd (patch)
tree31c676026b9cdef1028d8ff44db184d7e4088bda
parent48e12b28c72319a7b4ef5ccdd32cb66c863eefd6 (diff)
downloadportage-d4c853b91f13a320102ae87272f09885857a87cd.tar.gz
portage-d4c853b91f13a320102ae87272f09885857a87cd.tar.bz2
portage-d4c853b91f13a320102ae87272f09885857a87cd.zip
Add PKGDIR to the config.environ() whitelist so that people's
bashrc's don't break. svn path=/main/trunk/; revision=9114
-rw-r--r--pym/portage/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c9317c31a..64ae70948 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -874,6 +874,7 @@ class config(object):
"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",
@@ -2658,8 +2659,6 @@ class config(object):
phase = self.get("EBUILD_PHASE")
if phase:
whitelist = []
- if "package" == phase:
- whitelist.append("PKGDIR")
if "rpm" == phase:
whitelist.append("RPMDIR")
for k in whitelist: