public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: freedesktop-bugs@gentoo.org
Subject: Re: [gentoo-dev] [PATCH] xdg-utils.eclass: don't call binaries from ROOT
Date: Wed, 03 Oct 2018 09:33:53 +0200	[thread overview]
Message-ID: <1538552033.1042.0.camel@gentoo.org> (raw)
In-Reply-To: <20181003021638.2475-1-floppym@gentoo.org>

[-- Attachment #1: Type: text/plain, Size: 1719 bytes --]

On Tue, 2018-10-02 at 22:16 -0400, Mike Gilbert wrote:
> Avoid calling binaries that may have been compiled against different
> libraries or even cross-compiled for an incomatible arch.
> 
> Instead, always call the binaries installed in BROOT (/), if available.

Except BROOT doesn't have to be / (that's why we made it into
a variable)!  Also, wouldn't it be sufficient to use PATH lookup here
and let the PM handle providing the correct root?

> 
> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> ---
>  eclass/xdg-utils.eclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
> index fe1eef213ea4..b133de093082 100644
> --- a/eclass/xdg-utils.eclass
> +++ b/eclass/xdg-utils.eclass
> @@ -67,7 +67,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="${EPREFIX}${DESKTOP_DATABASE_UPDATE_BIN}"
>  
>  	if [[ ${EBUILD_PHASE} != post* ]] ; then
>  		die "xdg_desktop_database_update must be used in pkg_post* phases."
> @@ -88,7 +88,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="${EPREFIX}${MIMEINFO_DATABASE_UPDATE_BIN}"
>  
>  	if [[ ${EBUILD_PHASE} != post* ]] ; then
>  		die "xdg_mimeinfo_database_update must be used in pkg_post* phases."

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 963 bytes --]

  reply	other threads:[~2018-10-03  7:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-03  2:16 [gentoo-dev] [PATCH] xdg-utils.eclass: don't call binaries from ROOT Mike Gilbert
2018-10-03  7:33 ` Michał Górny [this message]
2018-10-03  9:23   ` James Le Cuirot
2018-10-03 12:05     ` Mike Gilbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1538552033.1042.0.camel@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=freedesktop-bugs@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox