From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F0150138359 for ; Wed, 15 Jul 2020 01:56:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9B15E087E; Wed, 15 Jul 2020 01:56:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE51DE087E for ; Wed, 15 Jul 2020 01:56:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E564534E84D for ; Wed, 15 Jul 2020 01:56:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2CC22D6 for ; Wed, 15 Jul 2020 01:56:28 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1594778162.3018f745b83ee4b6e11b0f6554a9472fe4517091.dilfridge@gentoo> Subject: [gentoo-commits] proj/locale-gen:master commit in: / X-VCS-Repository: proj/locale-gen X-VCS-Files: locale-gen X-VCS-Directories: / X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 3018f745b83ee4b6e11b0f6554a9472fe4517091 X-VCS-Branch: master Date: Wed, 15 Jul 2020 01:56:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d888ff5a-6529-440a-9b04-f55919c0c924 X-Archives-Hash: d3bae59dc8f33f499b2e323cc3b843ec commit: 3018f745b83ee4b6e11b0f6554a9472fe4517091 Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Jul 15 01:56:02 2020 +0000 Commit: Andreas K. Hüttel gentoo 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 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