Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Sun, 30 Aug 2020 21:44:18
Message-Id: 1598823050.f00973ece9cf491f49c65048b653696d863627d6.whissi@gentoo
1 commit: f00973ece9cf491f49c65048b653696d863627d6
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 21:30:50 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 21:30:50 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f00973ec
7
8 gen_funcs.sh: check_disk_space_requirements(): Force LC_ALL=C
9
10 This should make parsing df output more stable in case non-English locales are used.
11
12 Closes: https://github.com/gentoo/genkernel/pull/21
13 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
14
15 gen_funcs.sh | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18 diff --git a/gen_funcs.sh b/gen_funcs.sh
19 index ab7a7ce..72296e6 100755
20 --- a/gen_funcs.sh
21 +++ b/gen_funcs.sh
22 @@ -1853,7 +1853,7 @@ check_disk_space_requirements() {
23 gen_die "--check-free-disk-space-bootdir value '${CHECK_FREE_DISK_SPACE_BOOTDIR}' is not a valid number!"
24 fi
25
26 - available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
27 + available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
28 if [ -n "${available_free_disk_space}" ]
29 then
30 print_info 2 '' 1 0
31 @@ -1890,7 +1890,7 @@ check_disk_space_requirements() {
32 gen_die "--check-free-disk-space-kerneloutputdir value '${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR}' is not a valid number!"
33 fi
34
35 - available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
36 + available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
37 if [ -n "${available_free_disk_space}" ]
38 then
39 print_info 2 '' 1 0