[gentoo-commits] proj/locale-gen:master commit in: /

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/locale-gen:master commit in: /
Date: Sun, 26 Jul 2020 17:37:03 +0000 (UTC)	[thread overview]
Message-ID: <1595784997.8d707a9d314b8843608da773a072d2bcdce3eb35.dilfridge@gentoo> (raw)

commit:     8d707a9d314b8843608da773a072d2bcdce3eb35
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 17:36:37 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 17:36:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=8d707a9d

Rework C.UTF-8 insertion logic

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 locale-gen | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/locale-gen b/locale-gen
index 7741aa7..f740d70 100755
--- a/locale-gen
+++ b/locale-gen
@@ -189,26 +189,11 @@ if [[ -z ${locales_to_generate} ]] && [[ -e ${CONFIG} ]] ; then
 		ewarn "Some might be filtered, but you must fix it."
 		locales_to_generate=$(echo "${locales_to_generate}" | uniq)
 	fi
-
-	if echo ${locales_to_generate} | grep -vq 'C.UTF-8' ; then
-		if [[ -z  ${locales_to_generate} ]] ; then
-			locales_to_generate='C.UTF-8 UTF-8'
-		else
-			locales_to_generate=$(echo "${locales_to_generate}" ; echo -n 'C.UTF-8 UTF-8')
-		fi
-		CUTF_ADDED="true"
-	fi
 fi
 
 if [[ -z ${locales_to_generate} ]] ; then
 	[[ ${QUIET} -eq 0 ]] && [[ -z ${JUST_LIST} ]] && \
-		ewarn "No locales found, keeping locale archive"
-	exit 0
-fi
-
-if [[ ${locales_to_generate} == "C.UTF-8 UTF-8" ]] && [[ -n ${CUTF_ADDED} ]] ; then
-	[[ ${QUIET} -eq 0 ]] && [[ -z ${JUST_LIST} ]] && \
-		ewarn "No locales found, keeping locale archive"
+		ewarn "No locales to generate found, keeping locale archive"
 	exit 0
 fi
 
@@ -241,6 +226,13 @@ locales_disp=$(echo "${locales_to_generate}" | sed \
 	-e '   /@/   s:[[:space:]]*\([^@[:space:]]*\)\([^[:space:]]*\)[[:space:]]\+\([^[:space:]]*\):\1.\3\2:' \
 	-e '/^[^@]*$/s:[[:space:]]*\([^.[:space:]]*\)\([^[:space:]]*\)[[:space:]]\+\([^[:space:]]*\):\1.\3:')
 
+# Now check the normalized version for C.UTF-8, and add it if not present
+if echo ${locales_disp} | grep -vq 'C.UTF-8' ; then
+	locales_to_generate=$(echo "${locales_to_generate}" ; echo -n 'C.UTF-8 UTF-8')
+	locales_disp=$(echo "${locales_disp}" ; echo -n 'C.UTF-8')
+	CUTF_ADDED="true"
+fi
+
 eval declare -a locales_disp=(${locales_disp})
 eval declare -a locales_to_generate=(${locales_to_generate})
 total=$(( ${#locales_to_generate[*]} / 2 ))

next             reply	other threads:[~2020-07-26 17:37 UTC|newest]

Thread overview: 170+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-26 17:37 Andreas K. Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-11-05  8:13 [gentoo-commits] proj/locale-gen:master commit in: / Kerin Millar
2025-11-05  8:13 Kerin Millar
2025-10-31 19:59 Kerin Millar
2025-10-28 17:16 Kerin Millar
2025-10-28 17:10 Kerin Millar
2025-10-28 17:02 Kerin Millar
2025-10-28 17:02 Kerin Millar
2025-10-28 17:02 Kerin Millar
2025-10-28 17:02 Kerin Millar
2025-10-28 17:02 Kerin Millar
2025-10-28  2:31 Kerin Millar
2025-10-28  2:10 Kerin Millar
2025-10-28  1:48 Kerin Millar
2025-10-28  0:54 Kerin Millar
2025-10-28  0:54 Kerin Millar
2025-10-28  0:54 Kerin Millar
2025-10-28  0:54 Kerin Millar
2025-10-24 14:10 Kerin Millar
2025-10-20 14:58 Kerin Millar
2025-10-20  5:13 Kerin Millar
2025-10-20  5:13 Kerin Millar
2025-10-13  4:59 Kerin Millar
2025-09-18 23:06 Kerin Millar
2025-09-18 23:04 Kerin Millar
2025-09-18 23:04 Kerin Millar
2025-09-15  5:08 Kerin Millar
2025-09-15  4:07 Kerin Millar
2025-09-15  4:07 Kerin Millar
2025-09-15  4:07 Kerin Millar
2025-09-14  4:24 Kerin Millar
2025-09-14  4:20 Kerin Millar
2025-09-13 23:53 Kerin Millar
2025-09-13 23:51 Kerin Millar
2025-09-13 23:51 Kerin Millar
2025-09-13 23:23 Kerin Millar
2025-09-13 23:23 Kerin Millar
2025-09-13  9:42 Kerin Millar
2025-09-13  9:35 Kerin Millar
2025-09-13  9:27 Kerin Millar
2025-09-13  8:46 Kerin Millar
2025-09-13  8:42 Kerin Millar
2025-09-13  1:23 Kerin Millar
2025-09-13  1:14 Kerin Millar
2025-09-12 16:59 Kerin Millar
2025-09-12 16:59 Kerin Millar
2025-09-12 16:59 Kerin Millar
2025-09-12 16:59 Kerin Millar
2025-09-12 16:59 Kerin Millar
2025-09-12 16:59 Kerin Millar
2025-08-22 23:42 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-22 23:12 Kerin Millar
2025-08-20  2:39 Kerin Millar
2025-08-20  2:39 Kerin Millar
2025-08-19 13:37 Kerin Millar
2025-08-19 13:19 Kerin Millar
2025-08-18  2:46 Kerin Millar
2025-08-18  1:18 Kerin Millar
2025-08-18  1:18 Kerin Millar
2025-08-17  2:01 Kerin Millar
2025-08-16 23:17 Kerin Millar
2025-08-16 23:17 Kerin Millar
2025-08-16  3:46 Kerin Millar
2025-08-15 22:29 Kerin Millar
2025-08-15 22:29 Kerin Millar
2025-08-15 22:18 Kerin Millar
2025-08-15  5:35 Kerin Millar
2025-08-15  4:07 Kerin Millar
2025-08-15  3:57 Kerin Millar
2025-08-13 23:49 Kerin Millar
2025-08-13 22:53 Kerin Millar
2025-08-13 22:45 Kerin Millar
2025-08-13 21:42 Kerin Millar
2025-08-13 21:42 Kerin Millar
2025-08-13 21:42 Kerin Millar
2025-08-13 21:42 Kerin Millar
2025-08-13 21:42 Kerin Millar
2025-08-13 21:42 Kerin Millar
2025-08-13 10:09 Kerin Millar
2025-08-13 10:09 Kerin Millar
2025-08-12 17:32 Kerin Millar
2025-08-12  5:06 Kerin Millar
2025-08-12  5:06 Kerin Millar
2025-08-11 22:43 Kerin Millar
2025-08-11 16:04 Kerin Millar
2025-08-11 16:04 Kerin Millar
2025-08-11  0:39 Kerin Millar
2025-08-10 22:53 Kerin Millar
2025-08-10 22:22 Kerin Millar
2025-08-10 22:22 Kerin Millar
2025-08-10 17:05 Kerin Millar
2025-08-10  8:15 Kerin Millar
2025-08-10  1:22 Kerin Millar
2025-08-09 20:18 Kerin Millar
2025-08-09 19:42 Kerin Millar
2025-08-09 19:42 Kerin Millar
2025-08-09 19:42 Kerin Millar
2025-08-08 17:44 Kerin Millar
2025-08-08 17:44 Kerin Millar
2025-08-08 17:44 Kerin Millar
2025-08-08 17:44 Kerin Millar
2025-08-07 23:20 Kerin Millar
2025-08-07 23:20 Kerin Millar
2025-08-07 22:59 Kerin Millar
2025-08-07 22:59 Kerin Millar
2025-08-07 22:59 Kerin Millar
2025-08-07 22:59 Kerin Millar
2025-08-07 22:59 Kerin Millar
2025-08-07 19:43 Kerin Millar
2025-08-07 19:41 Kerin Millar
2025-08-07 19:41 Kerin Millar
2025-08-07 16:35 Kerin Millar
2025-08-07 16:20 Kerin Millar
2025-08-07 16:20 Kerin Millar
2025-08-07 16:20 Kerin Millar
2025-08-07 16:20 Kerin Millar
2025-08-07 16:20 Kerin Millar
2025-08-07 16:20 Kerin Millar
2025-08-06 17:02 Kerin Millar
2025-08-06  7:44 Kerin Millar
2025-08-06  6:48 Kerin Millar
2025-08-05 23:00 Kerin Millar
2025-08-05 21:53 Kerin Millar
2025-08-05 21:53 Kerin Millar
2025-08-05 21:53 Kerin Millar
2025-08-05 10:55 Kerin Millar
2025-08-05 10:32 Kerin Millar
2025-08-05 10:29 Kerin Millar
2025-08-05 10:29 Kerin Millar
2025-08-04 16:02 Kerin Millar
2025-08-04 12:13 Kerin Millar
2025-08-04 12:13 Kerin Millar
2025-08-04 11:56 Kerin Millar
2025-08-04 11:25 Kerin Millar
2025-08-04 11:19 Sam James
2025-07-01 21:02 Andreas K. Hüttel
2023-05-11 22:23 Andreas K. Hüttel
2023-03-21 17:37 Andreas K. Hüttel
2021-09-27  6:49 Mike Frysinger
2021-09-27  6:49 Mike Frysinger
2021-09-27  6:49 Mike Frysinger
2021-09-27  6:49 Mike Frysinger
2021-09-27  6:49 Mike Frysinger
2021-09-27  6:49 Mike Frysinger
2021-09-27  5:46 Mike Frysinger
2021-08-06 21:09 Andreas K. Hüttel
2021-03-12 16:28 Mike Frysinger
2020-07-27 15:38 Andreas K. Hüttel
2020-07-27 10:36 Andreas K. Hüttel
2020-07-26 17:37 Andreas K. Hüttel
2020-07-15  1:56 Andreas K. Hüttel
2020-07-15  1:56 Andreas K. Hüttel
2020-05-12  4:23 Andreas K. Hüttel
2020-05-12  4:23 Andreas K. Hüttel
2020-05-12  4:23 Andreas K. Hüttel
2020-05-12  4:23 Andreas K. Hüttel
2020-05-12  4:23 Andreas K. Hüttel
2020-05-12  4:23 Andreas K. Hüttel

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7741aa7 dfblob:f740d70 )
 OR (
bs:"[gentoo-commits] proj/locale-gen:master commit in: /" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1595784997.8d707a9d314b8843608da773a072d2bcdce3eb35.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox