From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41B841581EE for ; Wed, 02 Apr 2025 07:07:01 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2DA4534329C for ; Wed, 02 Apr 2025 07:07:01 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5132C1104BB; Wed, 02 Apr 2025 07:06:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 4C4371104BB for ; Wed, 02 Apr 2025 07:06:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 040C534328B for ; Wed, 02 Apr 2025 07:06:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F06D287C for ; Wed, 02 Apr 2025 07:06:39 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1743577578.67f008f6acc086e0a58dfebd1b019bcdad73620a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/distutils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 67f008f6acc086e0a58dfebd1b019bcdad73620a X-VCS-Branch: master Date: Wed, 02 Apr 2025 07:06:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 80d4abb8-1926-499c-a9a1-85fbb6029be4 X-Archives-Hash: 34a53ccfbd0e3956b52d135670cc2fd8 commit: 67f008f6acc086e0a58dfebd1b019bcdad73620a Author: Michał Górny gentoo org> AuthorDate: Wed Mar 26 11:32:32 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Apr 2 07:06:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f008f6 distutils-r1.eclass: Add a safety check for wheel install done Add a safety check to verify that distutils_wheel_install is being (usually indirectly) called in python_compile(), when using PEP517 build. If it weren't, this usually indicates that distutils-r1_python_compile (or distutils_pep517_install) was not called. Signed-off-by: Michał Górny gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/41222 Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 42e47a5b3028..e1672dd3c3b0 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1246,6 +1246,8 @@ distutils_wheel_install() { -o -path '*.dist-info/licenses' \ -o -path '*.dist-info/zip-safe' \ \) -delete || die + + _DISTUTILS_WHL_INSTALLED=1 } # @VARIABLE: DISTUTILS_WHEEL_PATH @@ -2011,6 +2013,11 @@ _distutils-r1_compare_installed_files() { _distutils-r1_post_python_compile() { debug-print-function ${FUNCNAME} "$@" + if [[ ! ${_DISTUTILS_WHL_INSTALLED} && ${DISTUTILS_USE_PEP517:-no} != no ]] + then + die "No wheel installed in python_compile(), did you call distutils-r1_python_compile?" + fi + local root=${BUILD_DIR}/install if [[ ${DISTUTILS_USE_PEP517} && -d ${root} ]]; then # copy executables to python-exec directory