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

tests: Fix locale detection 

When a locale with C.utf8 in its name (e.g. es_EC.utf8) was installed
on a system, the C.utf8 locale was chosen, even when it was not available.

This patch fixes the grep pattern to match whole lines returned by locale -a.

See: #1592

Closes: #1611
Approved by: cgwalters
This commit is contained in:
Jan Tojnar 2018-06-03 00:25:31 +02:00 committed by Atomic Bot
parent bf3525adcb
commit f200efdb8a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/libtest-core.sh
View File

@ -37,9 +37,9 @@ assert_not_reached () {
# Some tests look for specific English strings. Use a UTF-8 version # Some tests look for specific English strings. Use a UTF-8 version
# of the C (POSIX) locale if we have one, or fall back to POSIX # of the C (POSIX) locale if we have one, or fall back to POSIX
# (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8)
if locale -a | grep C.UTF-8 >/dev/null; then if locale -a | grep '^C.UTF-8$' >/dev/null; then
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
elif locale -a | grep C.utf8 >/dev/null; then elif locale -a | grep '^C.utf8$' >/dev/null; then
export LC_ALL=C.utf8 export LC_ALL=C.utf8
else else
export LC_ALL=C export LC_ALL=C