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.

Sign up for GitHub

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

Jump to bottom

Deprecate remaining non-PMS helpers #1035

Closed
wants to merge 3 commits into from
Closed

Deprecate remaining non-PMS helpers #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1bb630
ebuild-helpers/portageq: Deprecate
ulm May 11, 2023
e97d68e
prep{,all}strip: Deprecate in all EAPIs
ulm May 11, 2023
eb9eca6
NEWS: Mention portageq, prepstrip and prepallstrip changes
ulm May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
portage-3.0.49 (UNRELEASED)
--------------
Breaking changes:
* Output deprecation warnings for portageq, prepstrip and prepallstrip
when they are called from an ebuild (bug #906129, bug #906156).

portage-3.0.48 (UNRELEASED)
--------------
Bug fixes:
Expand Down
6 changes: 5 additions & 1 deletion bin/ebuild-helpers/portageq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/usr/bin/env bash
# Copyright 2009-2015 Gentoo Foundation
# Copyright 2009-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

scriptpath=${BASH_SOURCE[0]}
scriptname=${scriptpath##*/}

source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1

eqawarn "QA Notice: '${0##*/}' is not allowed in ebuild scope"

# Use safe cwd, avoiding unsafe import for bug #469338.
cd "${PORTAGE_PYM_PATH}" || exit 1

Expand Down
4 changes: 3 additions & 1 deletion bin/ebuild-helpers/prepallstrip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
Expand All @@ -8,6 +8,8 @@ if ___eapi_has_dostrip; then
die "${0##*/}: ${0##*/} has been banned for EAPI '${EAPI}'; use 'dostrip' instead"
fi

eqawarn "QA Notice: '${0##*/}' is not allowed in ebuild scope"

if ! ___eapi_has_prefix_variables; then
ED=${D}
fi
Expand Down
4 changes: 3 additions & 1 deletion bin/ebuild-helpers/prepstrip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
Expand All @@ -8,4 +8,6 @@ if ___eapi_has_dostrip; then
die "${0##*/}: ${0##*/} has been banned for EAPI '${EAPI}'; use 'dostrip' instead"
fi

eqawarn "QA Notice: '${0##*/}' is not allowed in ebuild scope"

__PORTAGE_HELPER=prepstrip exec "${PORTAGE_BIN_PATH}"/estrip "${@}"
Loading