eat extraneous whitespace in config file #132498 by Benno Schulenberg

1 files changed, 3 insertions, 3 deletions

diff --git a/locale-gen b/locale-gen
index 8e03be5..0b90dc7 100755
--- a/locale-gen
+++ b/locale-gen
@@ -41,7 +41,7 @@ show_usage() {
 	exit 1
 }
 show_version() {
-	local cvsver="$Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen,v 1.10 2006/05/06 00:30:04 vapier Exp $"
+	local cvsver="$Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen,v 1.11 2006/05/07 05:04:49 vapier Exp $"
 	cvsver=${cvsver##*locale-gen-}
 	echo "locale-gen-${cvsver%%,v *}"
 	exit 0
@@ -178,8 +178,8 @@ normalize() {
 # en_US.UTF-8 UTF-8       -> en_US.UTF-8
 # de_DE@euro  ISO-8859-15 -> de_DE.ISO-8859-15@euro
 locales_disp=$(echo "${locales_to_generate}" | sed \
-	-e '/\@/s:\([^\@ ]*\)\([^ ]*\) \(.*\):\1.\3\2:' \
-	-e '/[^\@]/s:\([^. ]*\)\([^ ]*\) \(.*\):\1.\3:')
+	-e '   /@/   s:[[:space:]]*\([^@[:space:]]*\)\([^[:space:]]*\)[[:space:]]\+\([^[:space:]]*\):\1.\3\2:' \
+	-e '/^[^@]*$/s:[[:space:]]*\([^.[:space:]]*\)\([^[:space:]]*\)[[:space:]]\+\([^[:space:]]*\):\1.\3:')
 
 eval declare -a locales_disp=(${locales_disp})
 eval declare -a locales_to_generate=(${locales_to_generate})