Author: aurel32
Date: 2010-09-14 15:56:36 +0000 (Tue, 14 Sep 2010)
New Revision: 4425
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/local/usr_sbin/update-locale
Log:
* update-locale: if LANGUAGE is not compatible with the selected default
locale, emit a warning and disable it instead of failing.
Closes: #596695.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-09-14 13:08:22 UTC (rev
4424)
+++ glibc-package/trunk/debian/changelog 2010-09-14 15:56:36 UTC (rev
4425)
@@ -6,13 +6,16 @@
version of the packages is known. Closes: #566720.
* kfreebsd/local-linuxthreads29.diff: correctly disable SO_CLOEXEC
support when it is not available. Closes: #596367.
+ * update-locale: if LANGUAGE is not compatible with the selected default
+ locale, emit a warning and disable it instead of failing.
+ Closes: #596695.
* Add armhf support. Closes: #596804.
[ Samuel Thibault ]
* patches/hurd-i386/submitted-catch-signal.diff: New patch to fix
signal-catching functions.
- -- Aurelien Jarno <aure...@debian.org> Tue, 14 Sep 2010 14:59:43 +0200
+ -- Aurelien Jarno <aure...@debian.org> Tue, 14 Sep 2010 17:54:16 +0200
eglibc (2.11.2-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/local/usr_sbin/update-locale
===================================================================
--- glibc-package/trunk/debian/local/usr_sbin/update-locale 2010-09-14
13:08:22 UTC (rev 4424)
+++ glibc-package/trunk/debian/local/usr_sbin/update-locale 2010-09-14
15:56:36 UTC (rev 4425)
@@ -107,10 +107,13 @@
}
}
$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'
- && $language ne 'C' && $language ne 'POSIX');
+ if ($msg !~ m/^$language/ && $var ne ''
+ && $msg ne 'C' && $msg ne 'POSIX'
+ && $language ne 'C' && $language ne 'POSIX')
+ {
+ print "*** $progname: Warning: LANGUAGE
($arg{LANGUAGE}) is not compatible with $var ($msg). Disabling it.\n";
+ $content =~ s/^(\s*LANGUAGE=)/#$1/mg;
+ }
}
}
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ovxsa-0000ql...@alioth.debian.org
