Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/locale-gen:master commit in: /
Date: Mon, 27 Sep 2021 06:49:14
Message-Id: 1632724725.953486683088c5aed6af94e97644a64c68e8d1f5.vapier@gentoo
1 commit: 953486683088c5aed6af94e97644a64c68e8d1f5
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 27 06:38:45 2021 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 27 06:38:45 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=95348668
7
8 fix hint about use of / in locale names
9
10 We checked $ret outside of the subshell where it was set, so this
11 code never actually fired. Move it up to where it should work.
12
13 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
14
15 locale-gen | 8 ++++----
16 1 file changed, 4 insertions(+), 4 deletions(-)
17
18 diff --git a/locale-gen b/locale-gen
19 index 03caff2..c746eef 100755
20 --- a/locale-gen
21 +++ b/locale-gen
22 @@ -299,14 +299,14 @@ generate_locale() {
23 elif [[ ${ret} -ne 0 ]] ; then
24 eerror "${disp}: ${x}"
25 fi
26 +
27 + if [[ ${ret} -ne 0 && ${locale} == */* ]] ; then
28 + ewarn "Perhaps you meant to use a space instead of a / in your config file ?"
29 + fi
30 exit ${ret}
31 ) &
32 JOB_PIDS+=( $! )
33 : $(( ++JOB_IDX_E ))
34 -
35 - if [[ ${ret} != 0 && ${locale} == */* ]] ; then
36 - ewarn "Perhaps you meant to use a space instead of a / in your config file ?"
37 - fi
38 }
39
40 JOB_PIDS=()