r1470 - in glibc-package/trunk/debian: . debhelper.in
Author: barbier
Date: 2006-05-04 22:28:44 +0000 (Thu, 04 May 2006)
New Revision: 1470
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales.config
Log:
* locales.config: Fix shell scripting when "All locales" is selected along
with other choices, Thanks Olivier Trichet. (Closes: #364251)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-04 22:07:13 UTC (rev 1469)
+++ glibc-package/trunk/debian/changelog 2006-05-04 22:28:44 UTC (rev 1470)
@@ -21,6 +21,8 @@
* Fix location of locales/NEWS.Debian. Thanks Matthijs Mohlmann.
(Closes: #362763)
* 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)
[ Michael Banck ]
* Add hurd-i386/cvs-posix-opts.diff (Define many missing options, most
Modified: glibc-package/trunk/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.config 2006-05-04 22:07:13 UTC (rev 1469)
+++ glibc-package/trunk/debian/debhelper.in/locales.config 2006-05-04 22:28:44 UTC (rev 1470)
@@ -56,14 +56,15 @@
;;
2)
db_get locales/locales_to_be_generated || RET=
- case ",$RET," in
- ",None,")
+ if expr ", $RET," : ".*, None,.*" >/dev/null 2>&1; then
+ # "None" was a choice in older packages
+ db_set locales/locales_to_be_generated ""
RET=
- ;;
- ",All locales,")
+ elif expr ", $RET," : ".*, All locales,.*" >/dev/null 2>&1; then
+ # When "All locales" is selected, other choices have to be dropped
+ db_set locales/locales_to_be_generated "All locales"
RET=$SUPPORTED_LOCALES
- ;;
- esac
+ fi
DEFAULT_LOCALES=$(echo $RET | sed -e 's/ [^ ]*,/,/g' -e 's/ [^ ]*$//')
if [ -n "$DEFAULT_LOCALES" ]; then
db_subst locales/default_environment_locale locales $DEFAULT_LOCALES
Reply to: