r1329 - in glibc-package/trunk/debian: . local/usr_sbin
Author: barbier
Date: 2006-04-06 19:22:19 +0000 (Thu, 06 Apr 2006)
New Revision: 1329
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/local/usr_sbin/update-locale
Log:
* update-locale: Fix buggy sanity check between LANGUAGE and LANG.
(Closes: #361091)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-06 17:34:57 UTC (rev 1328)
+++ glibc-package/trunk/debian/changelog 2006-04-06 19:22:19 UTC (rev 1329)
@@ -11,6 +11,8 @@
[ Denis Barbier ]
* debian/debhelper.in/locales.config: /etc/locale.gen was not generated at
initial installation. (Closes: #357523)
+ * update-locale: Fix buggy sanity check between LANGUAGE and LANG.
+ (Closes: #361091)
[ Michael Banck ]
* Add hurd-machrules-make.diff (fixes build problems with make-3.81 for
Modified: glibc-package/trunk/debian/local/usr_sbin/update-locale
===================================================================
--- glibc-package/trunk/debian/local/usr_sbin/update-locale 2006-04-06 17:34:57 UTC (rev 1328)
+++ glibc-package/trunk/debian/local/usr_sbin/update-locale 2006-04-06 19:22:19 UTC (rev 1329)
@@ -88,7 +88,7 @@
# Sanity checks
if ($no_checks == 0)
{
- # Check tthat this locale does exist
+ # Check that this locale does exist
my $charset = `$env locale charmap 2>&1`;
die "*** $progname: Error: invalid locale settings: $env\n"
if ($charset =~ m/Cannot set/);
@@ -96,6 +96,7 @@
if (defined $arg{LANGUAGE})
{
my $language = $arg{LANGUAGE};
+ $language =~ s/["']//g;
$language =~ s/[.:_].*//;
my $msg = '';
my $var = '';
@@ -107,6 +108,7 @@
$msg = $arg{$_};
}
}
+ $msg =~ s/["']//g;
die "*** $progname: Error: LANGUAGE ($arg{LANGUAGE}) is not compatible with $var ($msg)\n"
if ($msg !~ m/^$language/ && $var ne ''
&& $msg ne 'C' && $msg ne 'POSIX'
Reply to: