From 55a92e44a2ac58b7c1c598ff5fc9eaeeb6be9dfe Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 26 Jan 2026 14:32:57 -0500 Subject: [PATCH] distutils-r1.eclass: use eapi9-pipestatus rather than assert Preliminary work for EAPI 9, which bans the latter. Signed-off-by: Eli Schwartz --- eclass/distutils-r1.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index b9807554c6586..7cafa199bdac6 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -217,7 +217,7 @@ if [[ -z ${_DISTUTILS_R1_ECLASS} ]]; then _DISTUTILS_R1_ECLASS=1 case ${EAPI} in - 8) ;; + 8) inherit eapi9-pipestatus ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -1454,13 +1454,13 @@ distutils-r1_python_install() { ( cd "${reg_scriptdir}" && find . -mindepth 1 ) | sort > "${T}"/.distutils-files-bin - assert "listing ${reg_scriptdir} failed" + pipestatus || die "listing ${reg_scriptdir} failed" ( if [[ -d ${wrapped_scriptdir} ]]; then cd "${wrapped_scriptdir}" && find . -mindepth 1 fi ) | sort > "${T}"/.distutils-files-wrapped - assert "listing ${wrapped_scriptdir} failed" + pipestatus || die "listing ${wrapped_scriptdir} failed" if ! diff -U 0 "${T}"/.distutils-files-{bin,wrapped}; then die "File lists for ${reg_scriptdir} and ${wrapped_scriptdir} differ (see diff above)" fi