r1012 - in glibc-package/trunk/debian: . local/usr_sbin
Author: gotom
Date: 2005-08-22 09:50:51 +0000 (Mon, 22 Aug 2005)
New Revision: 1012
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/local/usr_sbin/locale-gen
Log:
* debian/local/usr_sbin/locale-gen: Don't break locale-gen when locale-def
warns errors.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-08-22 08:47:26 UTC (rev 1011)
+++ glibc-package/trunk/debian/changelog 2005-08-22 09:50:51 UTC (rev 1012)
@@ -14,6 +14,9 @@
- debian/sysdeps/gnu.mk: Rename to...
- debian/sysdeps/hurd.mk: ... this.
+ * debian/local/usr_sbin/locale-gen: Don't break locale-gen when locale-def
+ warns errors.
+
-- GOTO Masanori <gotom@debian.org> Sun, 21 Aug 2005 12:33:42 +0900
glibc (2.3.5-4) unstable; urgency=low
Modified: glibc-package/trunk/debian/local/usr_sbin/locale-gen
===================================================================
--- glibc-package/trunk/debian/local/usr_sbin/locale-gen 2005-08-22 08:47:26 UTC (rev 1011)
+++ glibc-package/trunk/debian/local/usr_sbin/locale-gen 2005-08-22 09:50:51 UTC (rev 1012)
@@ -36,7 +36,9 @@
echo -n '...'; \
if [ -f $LOCALES/$locale ]; then input=$locale; else \
input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
+ set +e; \
localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
+ set -e; \
echo ' done'; \
done < $LOCALEGEN
echo "Generation complete."
Reply to: