ebegin/eend: accept properly nested calls in different functions #824
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Turn the EBEGIN_EEND variable into a stack that tracks which function called ebegin. Calls to ebegin may be stacked and do not generate a QA warning if the callers are different functions. Calls to eend then check that the function name at the top of the stack matches the caller's function name. Bug: https://bugs.gentoo.org/839585 Bug: https://bugs.gentoo.org/839588 Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
|
Small demo: EAPI=8
DESCRIPTION="Testing package"
HOMEPAGE="http://nowhere.com"
LICENSE="GPL-2"
SLOT="0"
somefunc() {
ebegin "i'm somefunc"
#eend 0
}
pkg_pretend() {
ebegin "well hello there"
somefunc
eend 0
}and we get: Uncommenting the |
laumann
commented
Apr 21, 2022
| # Already a call to ebegin | ||
| local prev="${EBEGIN_EEND[-1]}" | ||
| if [[ "${prev}" == "${FUNCNAME[1]}" ]] ; then | ||
| eqawarn "QA Notice: ebegin called in ${prev}, but missing call to eend (${FUNCNAME[1]})" |
There was a problem hiding this comment.
err, maybe not the best message, as ${prev} and ${FUNCNAME[1]} will be the same string :-)
How about:
QA Notice: ebegin already called in ${prev}, but missing call to eend
?
laumann
commented
Apr 21, 2022
| eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${EBUILD_PHASE})" | ||
| # Already a call to ebegin | ||
| local prev="${EBEGIN_EEND[-1]}" | ||
| if [[ "${prev}" == "${FUNCNAME[1]}" ]] ; then |
There was a problem hiding this comment.
It was pointed out to me that properly recursive functions with properly nested ebegin-eend will still generate a QA notice here.
|
Maybe it would be better to ban nested ebegin calls and adjust the affected eclasses to not do that. |
The more I've thought about it, the more I would agree. |
floppym
pushed a commit
to floppym/portage
that referenced
this pull request
Jul 11, 2022
Turn the EBEGIN_EEND variable into a stack that tracks which function called ebegin. Calls to ebegin may be stacked and do not generate a QA warning if the callers are different functions. Calls to eend then check that the function name at the top of the stack matches the caller's function name. Bug: https://bugs.gentoo.org/839585 Bug: https://bugs.gentoo.org/839588 Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz> Closes: gentoo#824 Signed-off-by: Sam James <sam@gentoo.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Turn the EBEGIN_EEND variable into a stack that tracks which function
called ebegin. Calls to ebegin may be stacked and do not generate a QA
warning if the callers are different functions. Calls to eend then check
that the function name at the top of the stack matches the caller's
function name.
Bug: https://bugs.gentoo.org/839585
Bug: https://bugs.gentoo.org/839588
Signed-off-by: Thomas Bracht Laumann Jespersen t@laumann.xyz