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

[Eli Schwartz]

commit:     86bac40198775a3b97c75ce68b1114c2557874c4
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 27 02:32:46 2026 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 15:21:07 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bac401

unpacker.eclass: use eapi9-pipestatus rather than assert

Preliminary work for EAPI 9, which bans the latter.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 eclass/unpacker.eclass | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index e51c51dfa339..524221040350 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -16,7 +16,7 @@
 #  - support partial unpacks?
 
 case ${EAPI} in
-       7|8) ;;
+       7|8) inherit eapi9-pipestatus ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -281,7 +281,7 @@ unpack_makeself() {
 
        [[ -z ${decomp} ]] && decomp=$(_unpacker_get_decompressor ".${suffix}")
        "${exe[@]}" | ${decomp} | tar --no-same-owner -xf -
-       assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' 
+${skip})"
+       pipestatus || die "failure unpacking (${filetype}) makeself ${src##*/} 
('${ver}' +${skip})"
 }
 
 # @FUNCTION: unpack_deb
@@ -310,7 +310,7 @@ unpack_deb() {
                                        if [[ ${f} = "data.tar"* ]] ; then
                                                local 
decomp=$(_unpacker_get_decompressor "${f}")
                                                head -c "${size}" | 
${decomp:-cat}
-                                               assert "unpacking ${f} from 
${deb} failed"
+                                               pipestatus || die "unpacking 
${f} from ${deb} failed"
                                                break
                                        else
                                                head -c "${size}" > /dev/null # 
trash it
@@ -320,14 +320,14 @@ unpack_deb() {
                else
                        local f=$(
                                $(tc-getBUILD_AR) t "${deb}" | grep ^data.tar
-                               assert "data not found in ${deb}"
+                               pipestatus || die "data not found in ${deb}"
                        )
                        local decomp=$(_unpacker_get_decompressor "${f}")
                        $(tc-getBUILD_AR) p "${deb}" "${f}" | ${decomp:-cat}
-                       assert "unpacking ${f} from ${deb} failed"
+                       pipestatus || die "unpacking ${f} from ${deb} failed"
                fi
        } | tar --no-same-owner -xf -
-       assert "unpacking ${deb} failed"
+       pipestatus || die "unpacking ${deb} failed"
 }
 
 # @FUNCTION: unpack_cpio
@@ -491,7 +491,7 @@ unpack_gpkg() {
        mkdir -p "${dirname}" || die
        tar -xOf "${gpkg}" "${images[0]}" | ${decomp:-cat} |
                tar --no-same-owner -C "${dirname}" -xf -
-       assert "Unpacking ${gpkg} failed"
+       pipestatus || die "Unpacking ${gpkg} failed"
 }
 
 # @FUNCTION: _unpacker
@@ -569,7 +569,7 @@ _unpacker() {
                ${comp} < "${a}" | ${arch} -
        fi
 
-       assert "unpacking ${a} failed (comp=${comp} arch=${arch})"
+       pipestatus || die "unpacking ${a} failed (comp=${comp} arch=${arch})"
 }
 
 # @FUNCTION: unpacker