Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert portageq helper to a function #1164

Closed
wants to merge 1 commit into from

Conversation

floppym
Copy link
Contributor

@floppym floppym commented Oct 26, 2023

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

@floppym floppym requested a review from ulm October 26, 2023 14:45
@floppym floppym changed the title Convert portageq to a function Convert portageq helper to a function Oct 26, 2023
@floppym floppym force-pushed the portageq-function branch 2 times, most recently from e5f6b2c to 0e1a77a Compare October 26, 2023 15:17
Copy link
Member

@ulm ulm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also remove the following line from bin/portageq-wrapper:

--- portage/bin/portageq-wrapper
+++ portage/bin/portageq-wrapper
@@ -9,7 +9,6 @@
 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" "$@"

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>
@floppym
Copy link
Contributor Author

floppym commented Oct 26, 2023

Please also remove the following line from bin/portageq-wrapper:

Done.

@floppym floppym closed this Oct 26, 2023
@floppym floppym deleted the portageq-function branch October 26, 2023 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants