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 82E12138334 for ; Wed, 20 Jun 2018 22:22:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A716E0A9C; Wed, 20 Jun 2018 22:22:12 +0000 (UTC) Received: from mx-out1.startmail.com (mx-out1.startmail.com [145.131.90.139]) (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 F1434E09FA for ; Wed, 20 Jun 2018 22:22:11 +0000 (UTC) Date: Wed, 20 Jun 2018 17:21:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1529533329; bh=cOVFQmd3tb5b49zAEZIf2sGV78tB37kh4OTpoyTi2hM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ux+6XuvMKAqX4LzJT65fAMq3u/OPaW6UncasHv9g5TLvxdB0bs+UHxM/hzjHhz+zn X6Xd+IZiXqCrDCXNt6E6rpJi/lgqAAS9dlyv9uROohCZAP+U3Qipy5OwO9qYU1AEbD OMIADrv8Ye01wsqlrdVdoQ3YrwfkH0fgmDyC3/wpy9SxianSpPS8n+Uy2pU+3gQMa4 xsrTRcD2ol+vBUeYX7ra62qMEkd44+WCcQYgXJxazcOszbflyUZPbMQnMhH1Xf60Na YQR+TSP8f6ekIxakjND9QswQOFt80LTko2BgAoiWLqluRDdt0yTZqVPEpMU4QZJmFe t69rIKXkWdDjw== From: "Marty E. Plummer" To: Jason Zaman Cc: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH 1/4] xdg-utils.eclass: make EAPI 7 ready Message-ID: <20180620222108.qkxgody4hva5j5f3@proprietary-killer> References: <20180620071053.11589-1-hanetzer@startmail.com> <20180620130344.GA13850@baraddur.perfinion.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180620130344.GA13850@baraddur.perfinion.com> X-Archives-Salt: 001dbd60-afa9-4065-9533-1d3e3cd13912 X-Archives-Hash: c69babbccad485026496e31a1ad2803a On Wed, Jun 20, 2018 at 09:03:44PM +0800, Jason Zaman wrote: > On Wed, Jun 20, 2018 at 02:10:50AM -0500, Marty E. Plummer wrote: > > Use ${EROOT%/} whereever possible, as the tools and directories which > > are used with it are already prefixed with a / > > > > Package-Manager: Portage-2.3.40, Repoman-2.3.9 > > --- > > eclass/xdg-utils.eclass | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass > > index ac075185d8e..8dba5ed6861 100644 > > --- a/eclass/xdg-utils.eclass > > +++ b/eclass/xdg-utils.eclass > > @@ -15,7 +15,7 @@ > > # * XDG mime information database management > > > > case "${EAPI:-0}" in > > - 0|1|2|3|4|5|6) ;; > > + 0|1|2|3|4|5|6|7) ;; > > *) die "EAPI=${EAPI} is not supported" ;; > > esac > > > > @@ -66,7 +66,7 @@ xdg_environment_reset() { > > # Updates the .desktop files database. > > # Generates a list of mimetypes linked to applications that can handle them > > xdg_desktop_database_update() { > > - local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}" > > + local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}" > > Shouldn't things like this be $BROOT since they're being run? $EROOT > might be a different architecture that may or may not run at all on the > build machine. > Good point, but here's a question; if EROOT=${ROOT%/}${EPREFIX}, how do we use BROOT here? EBROOT? Or longhand ${BROOT%/}${EPREFIX} ? I think that may be a use case that got missed in the EAPI 7 discussions. > -- Jason > > > if [[ ${EBUILD_PHASE} != post* ]] ; then > > die "xdg_desktop_database_update must be used in pkg_post* phases." > > @@ -78,7 +78,7 @@ xdg_desktop_database_update() { > > fi > > > > ebegin "Updating .desktop files database" > > - "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}" > > + "${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}" > > eend $? > > } > > > > @@ -87,7 +87,7 @@ xdg_desktop_database_update() { > > # Update the mime database. > > # Creates a general list of mime types from several sources > > xdg_mimeinfo_database_update() { > > - local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}" > > + local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}" > > > > if [[ ${EBUILD_PHASE} != post* ]] ; then > > die "xdg_mimeinfo_database_update must be used in pkg_post* phases." > > @@ -99,6 +99,6 @@ xdg_mimeinfo_database_update() { > > fi > > > > ebegin "Updating shared mime info database" > > - "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}" > > + "${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}" > > eend $? > > } > > -- > > 2.17.1 > > > >