diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-09 06:10:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-09 06:10:53 +0000 |
| commit | fe34505cd30265b5826e4a34d9cffae7e82efe78 (patch) | |
| tree | dbea5bb2d802b57c8c6274cc9ddf038ff6982315 | |
| parent | 6ef7be46cc376b981a72bd987a91881e4edefb75 (diff) | |
| download | portage-fe34505cd30265b5826e4a34d9cffae7e82efe78.tar.gz portage-fe34505cd30265b5826e4a34d9cffae7e82efe78.tar.bz2 portage-fe34505cd30265b5826e4a34d9cffae7e82efe78.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.
svn path=/main/trunk/; revision=14975
| -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 4f1ad1c63..911f65bc2 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 7b892a652..9cfe88866 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", |