summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-29 18:21:50 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-29 18:21:50 +0000
commitf722cd1398de873da0c80560c2248b6205a5aed8 (patch)
treedbf29fb6318492e2c25b8137cb7756b86612b46b
parentMake the ecompressdir vecho output show a leading / on (diff)
downloadportage-multirepo-f722cd1398de873da0c80560c2248b6205a5aed8.tar.gz
portage-multirepo-f722cd1398de873da0c80560c2248b6205a5aed8.tar.bz2
portage-multirepo-f722cd1398de873da0c80560c2248b6205a5aed8.zip
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
-rw-r--r--pym/portage.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 569bc2ee..4df9b64b 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: