Gentoo Archives: gentoo-dev

From: James Le Cuirot <chewi@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] [PATCH 1/4] xdg-utils.eclass: make EAPI 7 ready
Date: Wed, 20 Jun 2018 22:34:21
Message-Id: 20180620233353.2efe0c64@symphony.aura-online.co.uk
In Reply to: Re: [gentoo-dev] [PATCH 1/4] xdg-utils.eclass: make EAPI 7 ready by "Marty E. Plummer"
1 On Wed, 20 Jun 2018 17:21:09 -0500
2 "Marty E. Plummer" <hanetzer@×××××××××.com> wrote:
3
4 > On Wed, Jun 20, 2018 at 09:03:44PM +0800, Jason Zaman wrote:
5 > > On Wed, Jun 20, 2018 at 02:10:50AM -0500, Marty E. Plummer wrote:
6 > > > Use ${EROOT%/} whereever possible, as the tools and directories which
7 > > > are used with it are already prefixed with a /
8 > > >
9 > > > Package-Manager: Portage-2.3.40, Repoman-2.3.9
10 > > > ---
11 > > > eclass/xdg-utils.eclass | 10 +++++-----
12 > > > 1 file changed, 5 insertions(+), 5 deletions(-)
13 > > >
14 > > > diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
15 > > > index ac075185d8e..8dba5ed6861 100644
16 > > > --- a/eclass/xdg-utils.eclass
17 > > > +++ b/eclass/xdg-utils.eclass
18 > > > @@ -66,7 +66,7 @@ xdg_environment_reset() {
19 > > > # Updates the .desktop files database.
20 > > > # Generates a list of mimetypes linked to applications that can handle them
21 > > > xdg_desktop_database_update() {
22 > > > - local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}"
23 > > > + local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}"
24 > >
25 > > Shouldn't things like this be $BROOT since they're being run? $EROOT
26 > > might be a different architecture that may or may not run at all on the
27 > > build machine.
28 > >
29 > Good point, but here's a question; if EROOT=${ROOT%/}${EPREFIX}, how do
30 > we use BROOT here? EBROOT? Or longhand ${BROOT%/}${EPREFIX} ? I think
31 > that may be a use case that got missed in the EAPI 7 discussions.
32
33 BROOT is already prefixed as BROOT without a prefix would just be /.
34
35 --
36 James Le Cuirot (chewi)
37 Gentoo Linux Developer

Replies

Subject Author
Re: [gentoo-dev] [PATCH 1/4] xdg-utils.eclass: make EAPI 7 ready "Marty E. Plummer" <hanetzer@×××××××××.com>