diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-12-10 01:04:47 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-10 01:04:47 +0000 |
| commit | ef79089821905fab5aa9b95ada3076bad70e391f (patch) | |
| tree | 552f243e3e9300554839c324e4bf3f3a59688ea9 | |
| parent | When overridding sys.std* in python2, use binary streams. (trunk r14974) (diff) | |
| download | portage-multirepo-ef79089821905fab5aa9b95ada3076bad70e391f.tar.gz portage-multirepo-ef79089821905fab5aa9b95ada3076bad70e391f.tar.bz2 portage-multirepo-ef79089821905fab5aa9b95ada3076bad70e391f.zip | |
Add localization variables (LANG and LC_*) to the environment whitelist and
filter them from the saved environment (so user settings override those of
binary packages). Thanks to Fabio Erculiani <lxnay@g.o> for reporting.
(trunk r14975)
svn path=/main/branches/2.1.7/; revision=15009
| -rwxr-xr-x | bin/isolated-functions.sh | 5 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 4f1ad1c6..911f65bc 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -506,6 +506,11 @@ save_ebuild_env() { unset ECHANGELOG_USER GPG_AGENT_INFO \ SSH_AGENT_PID SSH_AUTH_SOCK STY WINDOW XAUTHORITY + # localization settings + unset LANG LC_COLLATE LC_CTYPE LC_MESSAGES \ + LC_MONETARY LC_NUMERIC LC_TIME LC_PAPER \ + LC_ALL + # CCACHE and DISTCC config unset ${!CCACHE_*} ${!DISTCC_*} diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 0690267f..6b8d44cb 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1437,6 +1437,13 @@ class config(object): "TMPDIR", "TEMP", "TMP", ] + # localization settings + _environ_whitelist += [ + "LANG", "LC_COLLATE", "LC_CTYPE", "LC_MESSAGES", + "LC_MONETARY", "LC_NUMERIC", "LC_TIME", "LC_PAPER", + "LC_ALL", + ] + # other variables inherited from the calling environment _environ_whitelist += [ "CVS_RSH", "ECHANGELOG_USER", |