diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2018-12-14 20:43:04 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-05-12 07:08:39 +0300 |
| commit | e384fae0f4cafe49304afbc872cb7d3422903681 (patch) | |
| tree | ecafdebd549014e97e41ce05fd92f1eaa49344e9 | |
| parent | locale-gen: suppress ignored error when emptying already empty directory (diff) | |
| download | locale-gen-e384fae0f4cafe49304afbc872cb7d3422903681.tar.gz locale-gen-e384fae0f4cafe49304afbc872cb7d3422903681.tar.bz2 locale-gen-e384fae0f4cafe49304afbc872cb7d3422903681.zip | |
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@gentoo.org>
| -rwxr-xr-x | locale-gen | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 / } |