[gentoo-dev] [PATCH] linux-info.eclass: Call ebegin, properly close with eend

[gentoo-dev] [PATCH] linux-info.eclass: Call ebegin, properly close with eend

[Thomas Bracht Laumann Jespersen]

A recent QA check added to portage informs of eend being called without
a preceding call to ebegin.

This warning was emitted during pkg_setup for net-vpn/openvpn, and was
traced back to the check_extra_config() function in linux-info.eclass.

The preference is here to call ebegin (instead of dropping the lone
eend) and in each of the possible exit branches for check_extra_config()
call eend appropriately.

Reported-by: Sam James <sam@gentoo.org>
Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
---
 eclass/linux-info.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 57b1f4c89ae..7c4b030b9f1 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -781,7 +781,7 @@ check_extra_config() {
 		require_configured_kernel
 	fi
 
-	einfo "Checking for suitable kernel configuration options..."
+	ebegin "Checking for suitable kernel configuration options..."
 
 	for config in ${CONFIG_CHECK}
 	do
@@ -857,6 +857,7 @@ check_extra_config() {
 	done
 
 	if [[ ${hard_errors_count} -gt 0 ]]; then
+		eend 1
 		eerror "Please check to make sure these options are set correctly."
 		eerror "Failure to do so may cause unexpected problems."
 		eerror "Once you have satisfied these options, please try merging"
@@ -864,6 +865,7 @@ check_extra_config() {
 		export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
 		die "Incorrect kernel configuration options"
 	elif [[ ${soft_errors_count} -gt 0 ]]; then
+		eend 0
 		ewarn "Please check to make sure these options are set correctly."
 		ewarn "Failure to do so may cause unexpected problems."
 	else
-- 
2.35.1

Re: [gentoo-dev] [PATCH] linux-info.eclass: Call ebegin, properly close with eend

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

>>>>> On Wed, 13 Apr 2022, Thomas Bracht Laumann Jespersen wrote:
 
> -	einfo "Checking for suitable kernel configuration options..."
> +	ebegin "Checking for suitable kernel configuration options..."

ebegin outputs dots by itself, so the ones in the message should be
removed.
 
>  	elif [[ ${soft_errors_count} -gt 0 ]]; then
> +		eend 0
>  		ewarn "Please check to make sure these options are set correctly."
>  		ewarn "Failure to do so may cause unexpected problems."

Shouldn't this be eend 1, given that there are errors?

Ulrich

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: [gentoo-dev] [PATCH] linux-info.eclass: Call ebegin, properly close with eend

[Thomas Bracht Laumann Jespersen]

> > -	einfo "Checking for suitable kernel configuration options..."
> > +	ebegin "Checking for suitable kernel configuration options..."
> 
> ebegin outputs dots by itself, so the ones in the message should be
> removed.

Good point, will fix... ...

> >  	elif [[ ${soft_errors_count} -gt 0 ]]; then
> > +		eend 0
> >  		ewarn "Please check to make sure these options are set correctly."
> >  		ewarn "Failure to do so may cause unexpected problems."
> 
> Shouldn't this be eend 1, given that there are errors?

I was back and forth on this. It depends on what's meant by "soft errors" and if
they're considered fatal or not, I think. I'll change to "eend 1" for the v2.

-- Thomas