commit: ecf9d27564f4c197d1950d6cfe6b06071b0aad72
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 07:26:14 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 07:42:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf9d275
install-qa-check.d/60distutils...: Squash more false positives
Thanks to Arfrever for help with the pipeline.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
metadata/install-qa-check.d/60distutils-use-setuptools | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools
b/metadata/install-qa-check.d/60distutils-use-setuptools
index 698d832800f..097c7dc8e5a 100644
--- a/metadata/install-qa-check.d/60distutils-use-setuptools
+++ b/metadata/install-qa-check.d/60distutils-use-setuptools
@@ -29,10 +29,10 @@ distutils_use_setuptools_check() {
then
# entry_points == we need rdepend
new_expected=rdepend
- elif grep -q -E -s '^setuptools' \
- "${egg}"/requires.txt
+ elif grep -q -s '^setuptools' \
+ <(sed -e '/^\[/,$d'
"${egg}"/requires.txt)
then
- # explicit rdepend in package metadata
+ # explicit *unconditional* rdepend in
package metadata
new_expected=rdepend
else
new_expected=bdepend