* [gentoo-commits] portage r14975 - in main/trunk: bin pym/portage
@ 2009-12-09 6:10 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-12-09 6:10 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-12-09 06:10:53 +0000 (Wed, 09 Dec 2009)
New Revision: 14975
Modified:
main/trunk/bin/isolated-functions.sh
main/trunk/pym/portage/__init__.py
Log:
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.
Modified: main/trunk/bin/isolated-functions.sh
===================================================================
--- main/trunk/bin/isolated-functions.sh 2009-12-09 05:42:26 UTC (rev 14974)
+++ main/trunk/bin/isolated-functions.sh 2009-12-09 06:10:53 UTC (rev 14975)
@@ -506,6 +506,11 @@
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_*}
Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py 2009-12-09 05:42:26 UTC (rev 14974)
+++ main/trunk/pym/portage/__init__.py 2009-12-09 06:10:53 UTC (rev 14975)
@@ -1437,6 +1437,13 @@
"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",
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-12-09 6:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-09 6:10 [gentoo-commits] portage r14975 - in main/trunk: bin pym/portage Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox