aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2018-12-14 19:58:36 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2018-12-14 19:58:36 +0100
commit17f92140524ef53eb341a12851aa64a6a049289e (patch)
treef17583666f008fa3b86c3df02658b77e166f505e
parentcompat getdents64: Use correct offset for retry [BZ #23972] (diff)
downloadglibc-17f92140524ef53eb341a12851aa64a6a049289e.tar.gz
glibc-17f92140524ef53eb341a12851aa64a6a049289e.tar.bz2
glibc-17f92140524ef53eb341a12851aa64a6a049289e.zip
[no-patch] Gentoo: do not touch locale-archive or remove locales when listinggentoo/glibc-2.28-5
-rwxr-xr-xscripts/gentoo/extra/locale/locale-gen4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gentoo/extra/locale/locale-gen b/scripts/gentoo/extra/locale/locale-gen
index 93c754ab2f..f88c677e7a 100755
--- a/scripts/gentoo/extra/locale/locale-gen
+++ b/scripts/gentoo/extra/locale/locale-gen
@@ -343,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
@@ -371,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 / }