From: Mike Gilbert <floppym@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: freedesktop-bugs@gentoo.org
Subject: [gentoo-dev] [PATCH] xdg-utils.eclass: don't call binaries from ROOT
Date: Tue, 2 Oct 2018 22:16:38 -0400 [thread overview]
Message-ID: <20181003021638.2475-1-floppym@gentoo.org> (raw)
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.
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."
--
2.19.0
next reply other threads:[~2018-10-03 2:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 2:16 Mike Gilbert [this message]
2018-10-03 7:33 ` [gentoo-dev] [PATCH] xdg-utils.eclass: don't call binaries from ROOT Michał Górny
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=20181003021638.2475-1-floppym@gentoo.org \
--to=floppym@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