summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvapier <vapier>2006-08-19 16:17:52 +0000
committervapier <vapier>2006-08-19 16:17:52 +0000
commitd4993d3c30dab423d950fd9c166e9bc6a8fb9312 (patch)
tree775b31a57fbe85aec1eef0cf640641e6d5d5bd7a
parentadd some hacks to keep users happy #137538 (diff)
downloadlocale-gen-d4993d3c30dab423d950fd9c166e9bc6a8fb9312.tar.gz
locale-gen-d4993d3c30dab423d950fd9c166e9bc6a8fb9312.tar.bz2
locale-gen-d4993d3c30dab423d950fd9c166e9bc6a8fb9312.zip
if the current locale is broken, dont let `locale -a` spew errors
-rwxr-xr-xlocale-gen4
1 files changed, 2 insertions, 2 deletions
diff --git a/locale-gen b/locale-gen
index 95d3a0e..da28e81 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.13 2006/06/22 05:38:10 vapier Exp $"
+ local cvsver="$Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen,v 1.14 2006/08/19 16:17:52 vapier Exp $"
cvsver=${cvsver##*locale-gen-}
echo "locale-gen-${cvsver%%,v *}"
exit 0
@@ -213,7 +213,7 @@ cnt=0
if [[ -n ${UPDATE} ]] ; then
# normalize newlines into spaces
- existing_locales=" $(echo $(locale -a)) "
+ existing_locales=" $(echo $(locale -a 2>/dev/null)) "
fi
lidx=0