From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/
Date: Mon, 2 Jan 2023 20:45:58 +0000 (UTC) [thread overview]
Message-ID: <1672691727.69f2221413852630b2c231774e1f811f350fa3e6.floppym@gentoo> (raw)
commit: 69f2221413852630b2c231774e1f811f350fa3e6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 22:01:08 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jan 2 20:35:27 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=69f22214
_doebuild_path: simplify logic used to set PATH
Remove logic to incoporate PREROOTPATH and ROOTPATH. I'm not sure where
PREROOTPATH was ever used, and ROOTPATH has been deprecated in
baselayout for a while.
Remove logic to add hard-coded directories like
${EPREFIX}/{,usr{,/local}/{sbin,bin}. Adding these paths is unnecessary
if env.d or the calling environment have a valid PATH setting.
Add logic to ignore PATH from the calling environment if PATH is set in
env.d. This ensures that packages can update PATH by installing files in
/etc/env.d and this will work without having to restart Portage with an
updated environment.
Bug: https://bugs.gentoo.org/607696
Bug: https://bugs.gentoo.org/693308
Bug: https://bugs.gentoo.org/888543
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
lib/portage/package/ebuild/doebuild.py | 44 +++++++++++-----------------------
1 file changed, 14 insertions(+), 30 deletions(-)
diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py
index 05336e2aa..d29451efa 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -284,20 +284,8 @@ def _doebuild_path(settings, eapi=None):
if portage_bin_path[0] != portage.const.PORTAGE_BIN_PATH:
# Add a fallback path for restarting failed builds (bug 547086)
portage_bin_path.append(portage.const.PORTAGE_BIN_PATH)
- prerootpath = [x for x in settings.get("PREROOTPATH", "").split(":") if x]
- rootpath = [x for x in settings.get("ROOTPATH", "").split(":") if x]
- rootpath_set = frozenset(rootpath)
- overrides = [
- x for x in settings.get("__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x
- ]
-
- prefixes = []
- # settings["EPREFIX"] should take priority over portage.const.EPREFIX
- if portage.const.EPREFIX != settings["EPREFIX"] and settings["ROOT"] == os.sep:
- prefixes.append(settings["EPREFIX"])
- prefixes.append(portage.const.EPREFIX)
- path = overrides
+ path = [x for x in settings.get("__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x]
if "xattr" in settings.features:
for x in portage_bin_path:
@@ -317,24 +305,20 @@ def _doebuild_path(settings, eapi=None):
for x in portage_bin_path:
path.append(os.path.join(x, "ebuild-helpers"))
- path.extend(prerootpath)
-
- for prefix in prefixes:
- prefix = prefix if prefix else "/"
- for x in (
- "usr/local/sbin",
- "usr/local/bin",
- "usr/sbin",
- "usr/bin",
- "sbin",
- "bin",
- ):
- # Respect order defined in ROOTPATH
- x_abs = os.path.join(prefix, x)
- if x_abs not in rootpath_set:
- path.append(x_abs)
- path.extend(rootpath)
+ # If PATH is set in env.d, ignore PATH from the calling environment.
+ # This allows packages to update our PATH as they get installed.
+ if "PATH" in settings.configdict["env.d"]:
+ settings.configdict["env"].pop("PATH", None)
+
+ if "PATH" in settings:
+ pathset = set(path)
+ for p in settings["PATH"].split(":"):
+ # Avoid duplicate entries.
+ if p not in pathset:
+ path.append(p)
+ pathset.add(p)
+
settings["PATH"] = ":".join(path)
next reply other threads:[~2023-01-02 20:46 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-02 20:45 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-07 14:39 [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ Zac Medico
2024-07-19 5:41 Sam James
2024-06-17 0:25 Sam James
2024-06-17 0:20 Sam James
2024-03-24 22:20 Zac Medico
2023-12-20 14:04 Sam James
2023-12-20 14:04 Sam James
2023-12-20 14:04 Sam James
2023-12-10 22:01 Sam James
2023-10-22 22:46 Zac Medico
2023-10-16 5:15 Zac Medico
2023-10-13 10:33 Sam James
2023-10-13 10:19 Sam James
2023-10-13 10:19 Sam James
2023-08-19 15:05 Sam James
2023-06-14 19:23 Mike Gilbert
2023-06-14 19:23 Mike Gilbert
2023-02-17 0:53 Sam James
2023-01-27 8:38 Ulrich Müller
2022-07-12 23:33 Sam James
2022-06-12 18:25 Sam James
2021-12-11 2:54 Sam James
2021-12-11 2:54 Sam James
2021-11-15 8:34 Michał Górny
2021-11-08 22:37 Zac Medico
2021-10-28 5:00 Sam James
2021-10-28 4:52 Sam James
2021-10-03 19:31 Zac Medico
2021-09-28 11:25 Michał Górny
2021-09-28 11:19 Michał Górny
2021-09-28 7:21 Zac Medico
2021-09-27 20:51 Michał Górny
2021-09-08 10:17 Michał Górny
2021-08-05 8:47 Michał Górny
2021-06-20 18:54 Zac Medico
2021-06-05 18:08 Zac Medico
2021-06-05 18:08 Zac Medico
2021-05-31 19:54 Michał Górny
2021-05-24 5:25 Zac Medico
2021-02-25 9:33 Zac Medico
2021-02-24 15:14 Zac Medico
2021-02-22 5:32 Zac Medico
2021-01-17 13:15 Zac Medico
2021-01-10 3:24 Zac Medico
2020-11-02 1:34 Zac Medico
2020-09-14 7:23 Zac Medico
2020-08-03 21:42 Zac Medico
2020-08-03 21:42 Zac Medico
2020-08-03 19:30 Zac Medico
2020-08-03 19:30 Zac Medico
2020-08-03 19:30 Zac Medico
2020-05-31 23:58 Mike Gilbert
2020-05-31 21:17 Mike Gilbert
2020-05-31 20:34 Mike Gilbert
2020-05-18 19:23 Michał Górny
2020-05-06 6:37 Michał Górny
2020-03-23 1:49 Zac Medico
2020-03-23 1:40 Zac Medico
2020-03-15 1:24 Zac Medico
2020-03-02 16:53 Zac Medico
2020-03-02 4:48 Zac Medico
2020-02-15 20:44 Zac Medico
2020-02-15 20:28 Zac Medico
2019-12-09 7:03 Zac Medico
2019-10-29 1:17 Zac Medico
2019-10-24 19:31 Zac Medico
2019-10-21 17:49 Zac Medico
2019-10-20 9:26 Michał Górny
2019-10-19 23:52 Zac Medico
2019-10-14 20:45 Zac Medico
2019-10-14 20:35 Zac Medico
2019-10-14 20:13 Zac Medico
2019-10-13 19:50 Michał Górny
2019-09-03 15:36 Zac Medico
2019-09-02 20:13 Zac Medico
2019-08-20 23:43 Zac Medico
2019-08-14 1:40 Zac Medico
2019-07-30 7:09 Ulrich Müller
2019-06-18 17:14 Zac Medico
2019-06-10 19:01 Zac Medico
2019-01-21 22:20 Zac Medico
2019-01-01 20:58 Zac Medico
2018-12-20 4:29 Zac Medico
2018-12-07 0:41 Zac Medico
2018-11-19 6:43 Zac Medico
2018-11-09 3:22 Zac Medico
2018-10-10 7:58 Zac Medico
2018-10-08 21:41 Zac Medico
2018-08-20 23:11 Zac Medico
2018-08-17 22:35 Zac Medico
2018-08-12 2:31 Zac Medico
2018-08-11 21:06 Zac Medico
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=1672691727.69f2221413852630b2c231774e1f811f350fa3e6.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.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