Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/
Date: Thu, 29 Apr 2021 11:42:23
Message-Id: 1619696534.b9810954053e699b3b743bf059a1b91b4776763c.mgorny@gentoo
1 commit: b9810954053e699b3b743bf059a1b91b4776763c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 17 22:45:15 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 29 11:42:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9810954
7
8 install-qa-check.d: Extend DUS check to handle no egg-info
9
10 If the package does not install any .egg-info files, i.e. distutils
11 is probably not used at all, we do not the eclass to create a setuptools
12 dependency.
13
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 metadata/install-qa-check.d/60distutils-use-setuptools | 5 ++++-
17 1 file changed, 4 insertions(+), 1 deletion(-)
18
19 diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools b/metadata/install-qa-check.d/60distutils-use-setuptools
20 index 8970a6ab998..61209302ef3 100644
21 --- a/metadata/install-qa-check.d/60distutils-use-setuptools
22 +++ b/metadata/install-qa-check.d/60distutils-use-setuptools
23 @@ -51,7 +51,10 @@ distutils_use_setuptools_check() {
24 eerror "This could mean the package has bad conditions:"
25 eerror "https://dev.gentoo.org/~mgorny/python-guide/distutils.html#conditional-distutils-setuptools-use-in-packages"
26 eerror "Please report a bug about this and CC python@"
27 - elif [[ ${#expected[@]} -gt 0 ]]; then
28 + else
29 + # if we did not find anything, also assume 'no' is desired,
30 + # we do not want the setuptools dep
31 + [[ ${#expected[@]} -eq 0 ]] && expected=( no )
32 # *+rdepend=rdepend
33 has rdepend "${expected[@]}" && expected=( rdepend )
34 # for the time being, entry points imply rdepend