From fe34505cd30265b5826e4a34d9cffae7e82efe78 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 9 Dec 2009 06:10:53 +0000 Subject: 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 for reporting. svn path=/main/trunk/; revision=14975 --- bin/isolated-functions.sh | 5 +++++ pym/portage/__init__.py | 7 +++++++ 2 files changed, 12 insertions(+) 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", -- cgit v1.2.3-1-g7c22