commit: 3018f745b83ee4b6e11b0f6554a9472fe4517091 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Wed Jul 15 01:56:02 2020 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Wed Jul 15 01:56:02 2020 +0000 URL: https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=3018f745
Remove incomplete, nonfunctional ROOT support Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> locale-gen | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/locale-gen b/locale-gen index b330851..140654a 100755 --- a/locale-gen +++ b/locale-gen @@ -115,26 +115,23 @@ fi : ${ROOT:=/} ROOT="${ROOT%/}/" -if [[ -n ${DESTDIR} ]] && [[ ${ROOT} != "/" ]] ; then - eerror "DESTDIR and ROOT are mutually exclusive options" - exit 1 + +if [[ ${ROOT} != "/" ]] ; then + eerror "Sorry, but ROOT is not supported." + exit 0 fi -: ${EROOT:="${ROOT%/}${EPREFIX}/"} + +: ${EROOT:="${EPREFIX}/"} if [[ ${EROOT} != "/" ]] ; then einfo "Using locale.gen from ROOT ${EROOT}etc/" fi + if [[ -n ${DESTDIR} ]] ; then einfo "Building locales in DESTDIR '${DESTDIR}'" else DESTDIR=${EROOT} fi -# XXX: should fix this ... -if [[ ${ROOT} != "/" ]] ; then - eerror "Sorry, but ROOT support is incomplete at this time." - exit 0 -fi - : ${CONFIG:=${EROOT}etc/locale.gen} LOCALES=${DESTDIR}usr/share/i18n/locales CHARMAPS=${DESTDIR}usr/share/i18n/charmaps