From: Zack Cerza <zack@redhat.com>
Date: Tue, 4 Jun 2024 19:58:03 +0000 (-0600)
Subject: bootstrap: Don't force English locale
X-Git-Tag: 1.2.0~36^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02475c06d84fdfbc57b1ee327f56bf6aa46eefee;p=teuthology.git

bootstrap: Don't force English locale

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/bootstrap b/bootstrap
index 72b028407..c9dd835ef 100755
--- a/bootstrap
+++ b/bootstrap
@@ -187,7 +187,9 @@ if [ -f "$VENV/pyvenv.cfg" ]; then
     sed -i'' -e 's/\(include-system-site-packages\s*=\s*\)true/\1false/g' $VENV/pyvenv.cfg
 fi
 
-export LC_ALL=en_US.UTF-8
+# Attempt to force a UTF-8 locale without being specific to English
+export LANG=${LANG:-C.UTF-8}
+(echo $LANG | grep -qi utf-8) || export LC_ALL=$LANG.UTF-8
 
 if [ -z "$NO_CLOBBER" ] && \
   [ ! -e "./$VENV/bin/pip" -o ! -e "./$VENV/bin/$PYTHON" ] || \