From 9652aac4adf41834b6afabcc8a09b80c4e598592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 22 Sep 2020 08:59:06 +0200 Subject: [PATCH] install-qa-check.d: Allow bdepend/rdepend mix in DUS check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../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 cc3434f586c7c..551cb0f0b6cb0 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