From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6EAA3158451 for ; Mon, 8 Jan 2024 14:48:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E93A2BC03C; Mon, 8 Jan 2024 14:48:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 3221B2BC03B for ; Mon, 8 Jan 2024 14:48:34 +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 63515343333 for ; Mon, 8 Jan 2024 14:48:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C85E14B6 for ; Mon, 8 Jan 2024 14:48:30 +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: <1704725299.6f05bc88c81a42943e5784736d2eb15f63c5ef40.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/ X-VCS-Repository: repo/gentoo X-VCS-Files: metadata/install-qa-check.d/60python-site X-VCS-Directories: metadata/install-qa-check.d/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6f05bc88c81a42943e5784736d2eb15f63c5ef40 X-VCS-Branch: master Date: Mon, 8 Jan 2024 14:48:30 +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: bdde4b06-25d8-4b3b-82c8-ce79998484e7 X-Archives-Hash: 2596c5a7a0eefc016b6850a8c7340ec0 commit: 6f05bc88c81a42943e5784736d2eb15f63c5ef40 Author: Michał Górny gentoo org> AuthorDate: Fri Jan 5 15:52:16 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jan 8 14:48:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f05bc88 install-qa-check.d/60python-site: Add check for wrong libdir Bug: https://bugs.gentoo.org/702016 Bug: https://bugs.gentoo.org/770961 Signed-off-by: Michał Górny gentoo.org> metadata/install-qa-check.d/60python-site | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/metadata/install-qa-check.d/60python-site b/metadata/install-qa-check.d/60python-site index 3ac1dc91669e..ffc06edf0960 100644 --- a/metadata/install-qa-check.d/60python-site +++ b/metadata/install-qa-check.d/60python-site @@ -9,6 +9,10 @@ python_site_check() { local save=$(shopt -p nullglob) shopt -s nullglob local progs=( "${EPREFIX}"/usr/lib/python-exec/*/gpep517 ) + local bad_libdirs=() + [[ $(get_libdir) != lib ]] && bad_libdirs=( + "${ED}/usr/$(get_libdir)"/{python3,pypy}* + ) ${save} local forbidden_package_names=( @@ -185,6 +189,14 @@ python_site_check() { # the previous version from distutils-r1 #die "Failing install because of stray top-level files in site-packages" fi + + if [[ ${bad_libdirs[@]} ]]; then + eqawarn + eqawarn "QA Notice: Package installs Python files to /usr/$(get_libdir)" + eqawarn "instead of /usr/lib (use \$(python_get_sitedir)):" + eqawarn + eqatag -v python-site.libdir "${bad_libdirs[@]#${ED}}" + fi } python_site_check