diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2023-10-26 10:42:00 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2023-10-26 11:45:14 -0400 |
| commit | 27952b1d753ef4ea9bbd2307f8a9a315ad94557d (patch) | |
| tree | bb05b4349176455d6eccf5d8ed137f55e705f943 /bin | |
| parent | NEWS: add post-release template (diff) | |
| download | portage-27952b1d753ef4ea9bbd2307f8a9a315ad94557d.tar.gz portage-27952b1d753ef4ea9bbd2307f8a9a315ad94557d.tar.bz2 portage-27952b1d753ef4ea9bbd2307f8a9a315ad94557d.zip | |
Convert portageq helper to a function
This keeps it out of PATH in ebuilds to avoid breaking external
utilities that call portageq.
Bug: https://bugs.gentoo.org/906129
Bug: https://bugs.gentoo.org/916287
Bug: https://bugs.gentoo.org/916296
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild-helpers/portageq | 8 | ||||
| -rw-r--r-- | bin/phase-helpers.sh | 4 | ||||
| -rwxr-xr-x | bin/portageq-wrapper | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq deleted file mode 100755 index bd9d6b044..000000000 --- a/bin/ebuild-helpers/portageq +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2009-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 - -die "'${0##*/}' is not allowed in ebuild scope" -exit 1 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 3f12b3707..6c2ecf0bc 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -1006,6 +1006,10 @@ best_version() { ___best_version_and_has_version_common "$@" } +portageq() { + die "portageq is not allowed in ebuild scope" +} + if ___eapi_has_get_libdir; then get_libdir() { local libdir_var="LIBDIR_${ABI}" diff --git a/bin/portageq-wrapper b/bin/portageq-wrapper index afa2defe1..047d1d826 100755 --- a/bin/portageq-wrapper +++ b/bin/portageq-wrapper @@ -9,7 +9,6 @@ IFS=":" set -f # in case ${PATH} contains any shell glob characters for path in "${PORTAGE_BIN_PATH}" ${PATH}; do - [[ ${path} == */portage/*/ebuild-helpers* ]] && continue [[ -x ${path}/portageq ]] || continue PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ exec "${PORTAGE_PYTHON:-/usr/bin/python}" "${path}/portageq" "$@" |