r1471 - in glibc-package/trunk/debian: . local/usr_sbin
Author: barbier
Date: 2006-05-04 22:53:35 +0000 (Thu, 04 May 2006)
New Revision: 1471
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/local/usr_sbin/update-locale
Log:
* update-locale: When checking for invalid locale settings, do not mess up
with current environment settings.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-04 22:28:44 UTC (rev 1470)
+++ glibc-package/trunk/debian/changelog 2006-05-04 22:53:35 UTC (rev 1471)
@@ -23,6 +23,8 @@
* locales.postinst: Do not abort if the current locale is not generated.
* locales.config: Fix shell scripting when "All locales" is selected along
with other choices, Thanks Olivier Trichet. (Closes: #364251)
+ * update-locale: When checking for invalid locale settings, do not mess up
+ with current environment settings.
[ Michael Banck ]
* Add hurd-i386/cvs-posix-opts.diff (Define many missing options, most
Modified: glibc-package/trunk/debian/local/usr_sbin/update-locale
===================================================================
--- glibc-package/trunk/debian/local/usr_sbin/update-locale 2006-05-04 22:28:44 UTC (rev 1470)
+++ glibc-package/trunk/debian/local/usr_sbin/update-locale 2006-05-04 22:53:35 UTC (rev 1471)
@@ -87,7 +87,7 @@
if ($no_checks == 0)
{
# Check that this locale does exist
- my $charset = `$env locale charmap 2>&1`;
+ my $charset = `LANG= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= LC_ALL= $env locale charmap 2>&1`;
die "*** $progname: Error: invalid locale settings: $env\n"
if ($charset =~ m/Cannot set/);
# If LANGUAGE is set, its first value must be compatible with LC_MESSAGES
Reply to: