[SCM] live-config branch, debian-next, updated. debian/3.0_a43-1-10-gf6478d3
Daniel Baumann
daniel at debian.org
Sat Jul 21 20:23:05 UTC 2012
The following commit has been merged in the debian-next branch:
commit f6478d3b354f0d8ad5b86c8b580d7825b2837592
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jul 21 22:23:40 2012 +0200
Correcting multi-locales assembling in locales script.
diff --git a/scripts/config/0050-locales b/scripts/config/0050-locales
index 21136a9..ac91bfd 100755
--- a/scripts/config/0050-locales
+++ b/scripts/config/0050-locales
@@ -38,7 +38,7 @@ Configure_locales ()
then
# multiple locales specified
_LOCALE="$(echo ${LIVE_LOCALES} | sed -e 's|,.*||')"
- _LOCALES="$(echo ${LIVE_LOCALES} | sed -e 's|.*,||' -e 's|,| |g')"
+ _LOCALES="$(echo ${LIVE_LOCALES} | sed -e 0,/${_LOCALE}/{s/${_LOCALE}\,//})"
else
# one or no locale specified
_LOCALE="${LIVE_LOCALES:-en_US.UTF-8}"
--
live-config
More information about the debian-live-changes
mailing list