commit:     7e369fcd45c3c4b1fa941bf539ca6b0297a1860e
Author:     Zurab Kvachadze <zurabid2016 <AT> gmail <DOT> com>
AuthorDate: Wed Nov 12 15:20:40 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 13 12:33:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e369fcd

nginx-module.eclass: Add ebegin/eend when patching module's config

So that users are aware that some patching takes place.

Signed-off-by: Zurab Kvachadze <zurabid2016 <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44576
Closes: https://github.com/gentoo/gentoo/pull/44576
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/nginx-module.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/nginx-module.eclass b/eclass/nginx-module.eclass
index 714467248de2..c28ff5e316d2 100644
--- a/eclass/nginx-module.eclass
+++ b/eclass/nginx-module.eclass
@@ -615,6 +615,8 @@ nginx-module_src_prepare() {
        debug-print-function "${FUNCNAME[0]}" "$@"
        pushd "${NGINX_MOD_S}/${NGINX_MOD_CONFIG_DIR}" >/dev/null ||
                die "pushd failed"
+
+       ebegin "Patching module's config"
        # Since NGINX does not guarantee ABI or API stability, we utilise
        # preprocessor macros that were used to compile NGINX itself, to build 
third
        # party modules. As such, we do not want for the dummy preprocessor 
macros
@@ -638,9 +640,13 @@ nginx-module_src_prepare() {
        # header after the whole configuration, as it may contain other 
preprocessor
        # macros than only the module's ones.
        sed -i -e '1i\' -e ': > build/ngx_auto_config.h' config ||
-               die "sed failed"
+               { eend $? || die "sed failed"; }
+
        echo 'mv build/ngx_auto_config.h build/__ngx_gentoo_mod_config.h' \
-               >> config || die "echo failed"
+               >> config
+       # We specifically need the $? of echo.
+       # shellcheck disable=SC2320
+       eend $? || die "echo failed"
 
        # cd into module root and apply patches.
        pushd "${NGINX_MOD_S}" >/dev/null || die "pushd failed"

Reply via email to