[gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/

["Michał Górny" <mgorny@gentoo.org>]

commit:     001ccd6e3e1ac673b67eb68f9a4b67559506607b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 06:48:26 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 07:00:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001ccd6e

install-qa-check.d: Fix reporting integrity-errors in DUS check

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 metadata/install-qa-check.d/60distutils-use-setuptools | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools b/metadata/install-qa-check.d/60distutils-use-setuptools
index 6581b5dab09..cc3434f586c 100644
--- a/metadata/install-qa-check.d/60distutils-use-setuptools
+++ b/metadata/install-qa-check.d/60distutils-use-setuptools
@@ -5,6 +5,8 @@
 # Maintainer: Python project <python@gentoo.org>
 
 get_expected_distutils_use_setuptools() {
+	[[ ${integrity_error_new} ]] && return 1
+
 	local sitedir=${D}$(python_get_sitedir)
 	local egg new_expected
 	while read -d $'\0' -r egg; do
@@ -24,7 +26,8 @@ get_expected_distutils_use_setuptools() {
 		fi
 
 		if [[ ${expected} && ${new_expected} != ${expected} ]]; then
-			expected=integrity-error
+			integrity_error_new=${new_expected}
+			return 1
 		else
 			expected=${new_expected}
 		fi
@@ -39,13 +42,13 @@ distutils_use_setuptools_check() {
 	# pyproject.toml is verified by using it
 	[[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]] && return
 
-	local expected
+	local expected integrity_error_new
 	_distutils-r1_run_foreach_impl get_expected_distutils_use_setuptools
 
-	if [[ ${expected} == integrity-error ]]; then
+	if [[ ${integrity_error_new} ]]; then
 		eerror "DISTUTILS_USE_SETUPTOOLS integrity error!"
 		eerror "expected was:    ${expected}"
-		eerror "new_expected is: ${new_expected}"
+		eerror "new_expected is: ${integrity_error_new}"
 		eerror "Please report a bug about this and CC python@"
 	elif [[ ${DISTUTILS_USE_SETUPTOOLS} != ${expected} ]]; then
 			local def=