Add PKGDIR to the config.environ() whitelist so that people's

bashrc's don't break.

svn path=/main/trunk/; revision=9114

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c9317c31a0c6361257717b516cca7d5264187708..64ae709489ace557cb0e78fc217c32d1d1ec724d 100644 (file)
--- 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: