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

[Andreas K. Hüttel]

commit:     e384fae0f4cafe49304afbc872cb7d3422903681
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 19:43:04 2018 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue May 12 04:08:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=e384fae0

locale-gen: Always build the C.UTF-8 locale (which we now patch in)

Originally f2ed15510fd0f7b9bcc923e24efd2681aacd0d5f, gentoo/glibc-9999-9

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

 locale-gen | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/locale-gen b/locale-gen
index fc861f4..f88c677 100755
--- a/locale-gen
+++ b/locale-gen
@@ -181,6 +181,10 @@ 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
+		locales_to_generate=$(echo "${locales_to_generate}" ; echo "C.UTF-8 UTF-8")
+	fi
 fi
 
 if [[ -z ${locales_to_generate} ]] ; then
@@ -339,7 +343,7 @@ ret=$(( 0 ${JOB_RETS[@]/#/+} ))
 [[ ${QUIET} -eq 0 ]] && [[ -z ${JUST_LIST} ]] && \
 einfo "Generation complete"
 
-if ${LOCALE_ARCHIVE} ; then
+if ${LOCALE_ARCHIVE} && [[ -z ${JUST_LIST} ]] ; then
 	ebegin "Adding locales to archive"
 	# The pattern ends with / on purpose: we don't care about files (like
 	# locale-archive) in the locale subdir, and we definitely don't want to
@@ -367,7 +371,7 @@ if ${LOCALE_ARCHIVE} ; then
 fi
 
 # Remove locales that existed but were not requested
-if [[ -n ${UPDATE} ]] ; then
+if [[ -n ${UPDATE} ]] && [[ -z ${JUST_LIST} ]] ; then
 	# Ignore these pseudo locales
 	existing_locales=${existing_locales/ C / }
 	existing_locales=${existing_locales/ POSIX / }