packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1991 from dbnicholson/test-fixes 

tests/core: Really pick C.UTF-8 locale
This commit is contained in:
OpenShift Merge Robot 2020-01-21 21:13:02 +01:00 committed by GitHub
parent 20d84f40fa 5135a1e58a
commit 859dd00bfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/libtest-core.sh
View File

@ -41,7 +41,7 @@ assert_not_reached () {
# If we can't find the locale command assume we have support for C.UTF-8 # If we can't find the locale command assume we have support for C.UTF-8
# (e.g. musl based systems) # (e.g. musl based systems)
if type -p locale >/dev/null; then if type -p locale >/dev/null; then
export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) export LC_ALL=$(locale -a | grep -iEe '^(C|en_US)\.(UTF-8|utf8)$' | head -n1 || true)
if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi
else else
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8