[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sam James]

commit:     86ecbb120f0bc4c1c4fc3ae0e31f383474340998
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 19:45:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 19:57:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ecbb12

linux-mod.eclass: improve error handling for module compression

doins will 'die for us' in newer EAPIs, and add missing || dies to compressor 
calls.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/linux-mod.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index e837916b881a..e4c71cdf2c15 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -716,22 +716,22 @@ linux-mod_src_install() {
                # and similarily compress the module being built if != NONE.
 
                if linux_chkconfig_present MODULE_COMPRESS_XZ; then
-                       xz -T$(makeopts_jobs) ${modulename}.${KV_OBJ}
-                       doins ${modulename}.${KV_OBJ}.xz || die "doins 
${modulename}.${KV_OBJ}.xz failed"
+                       xz -T$(makeopts_jobs) ${modulename}.${KV_OBJ} || die 
"Compressing ${modulename}.${KV_OBJ} with xz failed"
+                       doins ${modulename}.${KV_OBJ}.xz
                elif linux_chkconfig_present MODULE_COMPRESS_GZIP; then
                        if type -P pigz ; then
-                               pigz -n$(makeopts_jobs) ${modulename}.${KV_OBJ}
+                               pigz -n$(makeopts_jobs) ${modulename}.${KV_OBJ} 
|| die "Compressing ${modulename}.${KV_OBJ} with pigz failed"
                        else
-                               gzip ${modulename}.${KV_OBJ}
+                               gzip ${modulename}.${KV_OBJ} || die 
"Compressing ${modulename}.${KV_OBJ} with gzip failed"
                        fi
-                       doins ${modulename}.${KV_OBJ}.gz || die "doins 
${modulename}.${KV_OBJ}.gz failed"
+                       doins ${modulename}.${KV_OBJ}.gz
                elif linux_chkconfig_present MODULE_COMPRESS_ZSTD; then
-                       zstd -T$(makeopts_jobs) ${modulename}.${KV_OBJ}
-                       doins ${modulename}.${KV_OBJ}.zst || die "doins 
${modulename}.${KV_OBJ}.zst failed"
+                       zstd -T$(makeopts_jobs) ${modulename}.${KV_OBJ} || 
"Compressing ${modulename}.${KV_OBJ} with zstd failed"
+                       doins ${modulename}.${KV_OBJ}.zst
                else
-                       doins ${modulename}.${KV_OBJ} || die "doins 
${modulename}.${KV_OBJ} failed"
+                       doins ${modulename}.${KV_OBJ}
                fi
-               cd "${OLDPWD}"
+               cd "${OLDPWD}" || die "${OLDPWD} does not exist"
 
                generate_modulesd "${objdir}/${modulename}"
        done