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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACE7A138359 for ; Tue, 22 Sep 2020 07:00:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BB86E0848; Tue, 22 Sep 2020 07:00:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 703BAE0848 for ; Tue, 22 Sep 2020 07:00:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F4223408F9 for ; Tue, 22 Sep 2020 07:00:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A471335F for ; Tue, 22 Sep 2020 07:00:41 +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: <1600758039.9652aac4adf41834b6afabcc8a09b80c4e598592.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/60distutils-use-setuptools X-VCS-Directories: metadata/install-qa-check.d/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9652aac4adf41834b6afabcc8a09b80c4e598592 X-VCS-Branch: master Date: Tue, 22 Sep 2020 07:00:41 +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: 27016ca4-f1b8-46cc-b3e8-fed7d75bda17 X-Archives-Hash: 2a115bd265d17ce6ea09b4e392710bc6 commit: 9652aac4adf41834b6afabcc8a09b80c4e598592 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 22 06:59:06 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 22 07:00:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9652aac4 install-qa-check.d: Allow bdepend/rdepend mix in DUS check Allow DISTUTILS_USE_SETUPTOOLS guess to partially evaluate to bdepend and partially to rdepend. That is the case in dev-python/hypothesis that installs CLI tools for CPython but not PyPy3. In this case, rdepend is the expected value. Signed-off-by: Michał Górny gentoo.org> metadata/install-qa-check.d/60distutils-use-setuptools | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools b/metadata/install-qa-check.d/60distutils-use-setuptools index cc3434f586c..551cb0f0b6c 100644 --- a/metadata/install-qa-check.d/60distutils-use-setuptools +++ b/metadata/install-qa-check.d/60distutils-use-setuptools @@ -26,8 +26,15 @@ get_expected_distutils_use_setuptools() { fi if [[ ${expected} && ${new_expected} != ${expected} ]]; then - integrity_error_new=${new_expected} - return 1 + if [[ ${expected}${new_expected} == [br]depend[br]depend ]] + then + # packages can have scripts that are installed + # conditionally to implementation + expected=rdepend + else + integrity_error_new=${new_expected} + return 1 + fi else expected=${new_expected} fi