Skip to content

Commit

Permalink
install-qa-check.d: Allow bdepend/rdepend mix in DUS check
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
mgorny committed Sep 22, 2020
1 parent 001ccd6 commit 9652aac
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions metadata/install-qa-check.d/60distutils-use-setuptools
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9652aac

Please sign in to comment.