| 1 |
commit: 3156d07f30384ec0669d2fdda1a46a83431781e5 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 3 07:39:47 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 3 08:16:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3156d07f |
| 7 |
|
| 8 |
metadata/install-qa-check.d: Skip DUS tests w/ DISTUTILS_OPTIONAL |
| 9 |
|
| 10 |
DISTUTILS_OPTIONAL skips setting the dependency on setuptools entirely, |
| 11 |
so skip checking for its correctness, and verbosely complain if it's |
| 12 |
set. |
| 13 |
|
| 14 |
Closs: https://bugs.gentoo.org/800147 |
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
metadata/install-qa-check.d/60distutils-use-setuptools | 9 +++++++++ |
| 18 |
1 file changed, 9 insertions(+) |
| 19 |
|
| 20 |
diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools b/metadata/install-qa-check.d/60distutils-use-setuptools |
| 21 |
index d08be885eb8..25300fddda9 100644 |
| 22 |
--- a/metadata/install-qa-check.d/60distutils-use-setuptools |
| 23 |
+++ b/metadata/install-qa-check.d/60distutils-use-setuptools |
| 24 |
@@ -12,6 +12,15 @@ distutils_use_setuptools_check() { |
| 25 |
# pyproject.toml is verified by using it |
| 26 |
[[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]] && return |
| 27 |
|
| 28 |
+ # setuptools dep is not set if distutils is optional |
| 29 |
+ if [[ ${DISTUTILS_OPTIONAL} ]]; then |
| 30 |
+ if [[ ${DISTUTILS_USE_SETUPTOOLS} != bdepend ]]; then |
| 31 |
+ eerror "QA Notice: DISTUTILS_USE_SETUPTOOLS is not used when DISTUTILS_OPTIONAL" |
| 32 |
+ eerror "is enabled." |
| 33 |
+ fi |
| 34 |
+ return |
| 35 |
+ fi |
| 36 |
+ |
| 37 |
local expected=() |
| 38 |
for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do |
| 39 |
local EPYTHON PYTHON |
Archives