commit: 28ada16af437c0f2955f222abd03730ae2e299d6 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Mon Jun 28 18:12:02 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Mon Jun 28 18:46:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ada16a
metadata/install-qa-check.d: add QA Notice string to all checks and re-wrap some lines to fit into 80 char limit Bug: https://bugs.gentoo.org/728046 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> metadata/install-qa-check.d/08gentoo-paths | 2 +- metadata/install-qa-check.d/60appdata-path | 4 ++-- metadata/install-qa-check.d/60distutils-use-setuptools | 6 ++++-- metadata/install-qa-check.d/60gtk-doc-paths | 6 +++--- metadata/install-qa-check.d/60python-pyc | 7 ++++--- metadata/install-qa-check.d/60python-tests | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/metadata/install-qa-check.d/08gentoo-paths b/metadata/install-qa-check.d/08gentoo-paths index 5161aef9922..4d84925d853 100644 --- a/metadata/install-qa-check.d/08gentoo-paths +++ b/metadata/install-qa-check.d/08gentoo-paths @@ -66,7 +66,7 @@ gentoo_path_check() { # report # ------ if [[ -n ${bad_paths[@]} ]]; then - eqawarn "The ebuild is installing to one or more unexpected paths:" + eqawarn "QA Notice: The ebuild is installing to one or more unexpected paths:" eqawarn eqatag -v non-gentoo-paths "${bad_paths[@]}" eqawarn diff --git a/metadata/install-qa-check.d/60appdata-path b/metadata/install-qa-check.d/60appdata-path index a2403083a49..06c5f91e8ce 100644 --- a/metadata/install-qa-check.d/60appdata-path +++ b/metadata/install-qa-check.d/60appdata-path @@ -13,8 +13,8 @@ appdata_path_check() { done < <(find "${ED%/}/usr/share/appdata" -name '*.xml' -print0 || die) if [[ ${found[@]} ]]; then - eqawarn "QA Notice: This package seems to install metainfo files into the following" - eqawarn "location(s):" + eqawarn "QA Notice: This package seems to install metainfo files into the" + eqawarn "following location(s):" eqawarn eqatag -v appdata.invalid-path "${found[@]#${D%/}}" eqawarn diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools b/metadata/install-qa-check.d/60distutils-use-setuptools index effa65358aa..d08be885eb8 100644 --- a/metadata/install-qa-check.d/60distutils-use-setuptools +++ b/metadata/install-qa-check.d/60distutils-use-setuptools @@ -47,7 +47,9 @@ distutils_use_setuptools_check() { if [[ ${#expected[@]} -gt 1 ]] && has no "${expected[@]}"; then # 'no' and '[rb]depend' are mutually exclusive - eerror "The package seems to have used distutils and setuptools simultaneously." + eerror "QA Notice: The package seems to have used distutils and setuptools" + eerror "simultaneously" + eerror "" eerror "This could mean the package has bad conditions:" eerror "https://dev.gentoo.org/~mgorny/python-guide/distutils.html#conditional-distutils-setuptools-use-in-packages"; eerror "Please report a bug about this and CC python@" @@ -74,7 +76,7 @@ distutils_use_setuptools_check() { local def= [[ ${DISTUTILS_USE_SETUPTOOLS} == bdepend ]] && def=' (or unset)' - eqawarn "DISTUTILS_USE_SETUPTOOLS value is probably incorrect" + eqawarn "QA Notice: DISTUTILS_USE_SETUPTOOLS value is probably incorrect" eqawarn " have: DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}${def}" if [[ ${expected[0]} == bdepend ]]; then eqawarn " expected: (unset)" diff --git a/metadata/install-qa-check.d/60gtk-doc-paths b/metadata/install-qa-check.d/60gtk-doc-paths index 866e871c221..8c12c260433 100644 --- a/metadata/install-qa-check.d/60gtk-doc-paths +++ b/metadata/install-qa-check.d/60gtk-doc-paths @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # QA check: ensure that gtk-doc files are installed in /usr/share/gtk-doc @@ -14,8 +14,8 @@ gtk_doc_path_check() { if [[ ${found[@]} ]]; then eqawarn - eqawarn "This package seems to install gtk-doc documentation into the following" - eqawarn "location(s):" + eqawarn "QA Notice: This package seems to install gtk-doc documentation into the" + eqawarn "following location(s):" eqawarn eqatag -v gtk-doc-paths.invalid-path "${found[@]#${D%/}}" eqawarn diff --git a/metadata/install-qa-check.d/60python-pyc b/metadata/install-qa-check.d/60python-pyc index ddc1bf531cd..e112cdce348 100644 --- a/metadata/install-qa-check.d/60python-pyc +++ b/metadata/install-qa-check.d/60python-pyc @@ -55,7 +55,8 @@ if [[ ${EAPI} == [6-7] ]]; then if [[ ${missing[@]} ]]; then eqawarn - eqawarn "This package installs one or more Python modules that are not byte-compiled." + eqawarn "QA Notice: This package installs one or more Python modules that are" + eqawarn "not byte-compiled." eqawarn "The following files are missing:" eqawarn eqatag -v python-pyc.missing "${missing[@]#${D}}" @@ -63,8 +64,8 @@ if [[ ${EAPI} == [6-7] ]]; then if [[ ${outdated[@]} ]]; then eqawarn - eqawarn "This package installs one or more compiled Python modules that have older" - eqawarn "timestamps than the corresponding source files:" + eqawarn "QA Notice: This package installs one or more compiled Python modules that have" + eqawarn "older timestamps than the corresponding source files:" eqawarn eqatag -v python-pyc.outdated "${outdated[@]#${D}}" fi diff --git a/metadata/install-qa-check.d/60python-tests b/metadata/install-qa-check.d/60python-tests index 713ed63d376..4c7892fbc93 100644 --- a/metadata/install-qa-check.d/60python-tests +++ b/metadata/install-qa-check.d/60python-tests @@ -17,7 +17,7 @@ python_test_check() { [[ -n ${any} ]] || return eqawarn - eqawarn 'QA Notice: this package seems to contain tests but they are not enabled.' + eqawarn 'QA Notice: This package seems to contain tests but they are not enabled.' eqawarn 'Please either run tests (via distutils_enable_tests or declaring' eqawarn 'python_test yourself), or add RESTRICT="test" along with an explanatory' eqawarn 'comment if tests cannot be run.'
