From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 10 Dec 2009 01:04:47 +0000 (-0000)
Subject: Add localization variables (LANG and LC_*) to the environment whitelist and
X-Git-Tag: v2.1.7.12~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef79089821905fab5aa9b95ada3076bad70e391f;p=portage.git

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
---

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 0690267fa..6b8d44cb7 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",