r967 - in glibc-package/trunk/debian: . debhelper.in
Author: gotom
Date: 2005-07-22 14:21:04 +0000 (Fri, 22 Jul 2005)
New Revision: 967
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales.postinst
Log:
- debian/debhelper.in/locales.postinst: Fix repeated locale entry
duplication when at least a locale is defined twice in /etc/locale.gen.
(Closes: #271526)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-07-22 14:14:52 UTC (rev 966)
+++ glibc-package/trunk/debian/changelog 2005-07-22 14:21:04 UTC (rev 967)
@@ -47,6 +47,9 @@
- debian/debhelper.in/locales.config: Use LANG=C for locale-dependent
commands. (Closes: #314717)
- debian/debhelper.in/locales.postinst: Likewise.
+ - debian/debhelper.in/locales.postinst: Fix repeated locale entry
+ duplication when at least a locale is defined twice in /etc/locale.gen.
+ (Closes: #271526)
-- GOTO Masanori <gotom@debian.org> Sun, 17 Jul 2005 17:27:30 +0900
Modified: glibc-package/trunk/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.postinst 2005-07-22 14:14:52 UTC (rev 966)
+++ glibc-package/trunk/debian/debhelper.in/locales.postinst 2005-07-22 14:21:04 UTC (rev 967)
@@ -33,7 +33,10 @@
save_IFS=$IFS
IFS=,
for locale in $list; do
- if grep -q "^#$locale *\$" $LG; then
+ if grep -q "^$locale *\$" $LG; then
+ # This locale has already been inserted, do nothing
+ :
+ elif grep -q "^#$locale *\$" $LG; then
# Uncomment previous defined locales
sed -e "s,#$locale *\$,$locale," $LG > $LG.tmp || true
mv -f $LG.tmp $LG
Reply to: