commit: d801ec255a6725775b5e3d672b8c00e9c0095200 Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org> AuthorDate: Fri Jan 26 11:14:48 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 9 07:09:43 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d801ec25
bin: prefix eqawarn with 'QA Notice' Bug: https://bugs.gentoo.org/728046 Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org> Closes: https://github.com/gentoo/portage/pull/1239 Signed-off-by: Sam James <sam <AT> gentoo.org> bin/ebuild-helpers/dohtml | 2 +- bin/ebuild-helpers/fowners | 2 +- bin/ebuild-helpers/fperms | 2 +- bin/install-qa-check.d/05prefix | 6 +++--- bin/install-qa-check.d/60bash-completion | 4 ++-- bin/install-qa-check.d/90bad-bin-group-write | 2 +- bin/install-qa-check.d/90bad-bin-owner | 2 +- bin/install-qa-check.d/90cmake-warnings | 2 +- bin/install-qa-check.d/90world-writable | 2 +- bin/install-qa-check.d/95empty-dirs | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml index 55339238e8..4d4efd496c 100755 --- a/bin/ebuild-helpers/dohtml +++ b/bin/ebuild-helpers/dohtml @@ -10,7 +10,7 @@ if ! ___eapi_has_dohtml; then fi if ___eapi_has_dohtml_deprecated; then - eqawarn "'${0##*/}' is deprecated in EAPI '${EAPI}'" + eqawarn "QA Notice: '${0##*/}' is deprecated in EAPI '${EAPI}'" fi # Use safe cwd, avoiding unsafe import for bug #469338. diff --git a/bin/ebuild-helpers/fowners b/bin/ebuild-helpers/fowners index fa4e3c0d7f..d05094caba 100755 --- a/bin/ebuild-helpers/fowners +++ b/bin/ebuild-helpers/fowners @@ -21,7 +21,7 @@ for arg; do args+=( "${ED%/}/${arg#/}" ) # remove the QA warning after 2024-12-31 if [[ ${arg:0:1} != / ]]; then - eqawarn "${0##*/}: Path '${arg}' does not start with '/'." + eqawarn "QA Notice: ${0##*/}: Path '${arg}' does not start with '/'." eqawarn "This is unsupported. Add a slash for a path in \${ED}," eqawarn "or use 'chown' for a path relative to the working dir." fi diff --git a/bin/ebuild-helpers/fperms b/bin/ebuild-helpers/fperms index d52f5a767e..16772d11f2 100755 --- a/bin/ebuild-helpers/fperms +++ b/bin/ebuild-helpers/fperms @@ -22,7 +22,7 @@ for arg; do args+=( "${ED%/}/${arg#/}" ) # remove the QA warning after 2024-12-31 if [[ ${arg:0:1} != / ]]; then - eqawarn "${0##*/}: Path '${arg}' does not start with '/'." + eqawarn "QA Notice: ${0##*/}: Path '${arg}' does not start with '/'." eqawarn "This is unsupported. Add a slash for a path in \${ED}," eqawarn "or use 'chmod' for a path relative to the working dir." fi diff --git a/bin/install-qa-check.d/05prefix b/bin/install-qa-check.d/05prefix index 28f2c06afe..edbd6fab2f 100644 --- a/bin/install-qa-check.d/05prefix +++ b/bin/install-qa-check.d/05prefix @@ -71,7 +71,7 @@ install_qa_check_prefix() { echo "${fn#${D}}:${line[0]} (explicit EPREFIX but target not found)" \ >> "${T}"/non-prefix-shebangs-errs else - eqawarn "${fn#${D}} has explicit EPREFIX in shebang but target not found (${line[0]})" + eqawarn "QA Notice: ${fn#${D}} has explicit EPREFIX in shebang but target not found (${line[0]})" fi fi continue @@ -81,7 +81,7 @@ install_qa_check_prefix() { if [[ -e ${EROOT}${line[0]} || -e ${ED}${line[0]} ]] ; then # is it unprefixed, but we can just fix it because a # prefixed variant exists - eqawarn "prefixing shebang of ${fn#${D}}" + eqawarn "QA Notice: prefixing shebang of ${fn#${D}}" # statement is made idempotent on purpose, because # symlinks may point to the same target, and hence the # same real file may be sedded multiple times since we @@ -98,7 +98,7 @@ install_qa_check_prefix() { # unprefixed/invalid shebang, but outside ${PATH}, this may be # intended (e.g. config.guess) so remain silent by default has stricter ${FEATURES} && \ - eqawarn "invalid shebang in ${fn#${D}}: ${line[0]}" + eqawarn "QA Notice: invalid shebang in ${fn#${D}}: ${line[0]}" fi done if [[ -e "${T}"/non-prefix-shebangs-errs ]] ; then diff --git a/bin/install-qa-check.d/60bash-completion b/bin/install-qa-check.d/60bash-completion index c1547619a5..85573df0e5 100644 --- a/bin/install-qa-check.d/60bash-completion +++ b/bin/install-qa-check.d/60bash-completion @@ -10,7 +10,7 @@ bashcomp_check() { instcompdir=${ED}/usr/share/bash-completion/completions elif [[ -d ${ED}/usr/share/bash-completion ]]; then if [[ ${syscompdir} != ${EPREFIX}/usr/share/bash-completion ]]; then - eqawarn "Bash completions were installed in legacy location. Please update" + eqawarn "QA Notice: Bash completions were installed in legacy location. Please update" eqawarn "the ebuild to get the install paths using bash-completion-r1.eclass." eqawarn fi @@ -111,7 +111,7 @@ bashcomp_check() { done if [[ -n ${qa_warnings[@]} ]]; then - eqawarn "Problems with installed bash completions were found:" + eqawarn "QA Notice: Problems with installed bash completions were found:" eqawarn for c in "${qa_warnings[@]}"; do eqawarn " ${c}" diff --git a/bin/install-qa-check.d/90bad-bin-group-write b/bin/install-qa-check.d/90bad-bin-group-write index 786dde712e..7b5a0c02db 100644 --- a/bin/install-qa-check.d/90bad-bin-group-write +++ b/bin/install-qa-check.d/90bad-bin-group-write @@ -43,7 +43,7 @@ bad_bin_group_write_check() { done if [[ ${found[@]} ]]; then - eqawarn "system executables group-writable by nonzero gid:" + eqawarn "QA Notice: system executables group-writable by nonzero gid:" for f in "${found[@]}"; do # Strip off the leading destdir before outputting the path. eqawarn " ${f#${D%/}}" diff --git a/bin/install-qa-check.d/90bad-bin-owner b/bin/install-qa-check.d/90bad-bin-owner index 46d4e39476..74255c02f0 100644 --- a/bin/install-qa-check.d/90bad-bin-owner +++ b/bin/install-qa-check.d/90bad-bin-owner @@ -36,7 +36,7 @@ bad_bin_owner_check() { done if [[ ${found[@]} ]]; then - eqawarn "system executables owned by nonzero uid:" + eqawarn "QA Notice: system executables owned by nonzero uid:" for f in "${found[@]}"; do # Strip off the leading destdir before outputting the path. eqawarn " ${f#${D%/}}" diff --git a/bin/install-qa-check.d/90cmake-warnings b/bin/install-qa-check.d/90cmake-warnings index a6e901efc5..fba1b7ffba 100644 --- a/bin/install-qa-check.d/90cmake-warnings +++ b/bin/install-qa-check.d/90cmake-warnings @@ -13,7 +13,7 @@ cmake_warn_check() { | LC_ALL=C sort -u) if [[ ${vars} ]]; then - eqawarn "One or more CMake variables were not used by the project:" + eqawarn "QA Notice: One or more CMake variables were not used by the project:" local v for v in "${vars[@]}"; do eqawarn " ${v}" diff --git a/bin/install-qa-check.d/90world-writable b/bin/install-qa-check.d/90world-writable index 6a521b3cc7..a166c67330 100644 --- a/bin/install-qa-check.d/90world-writable +++ b/bin/install-qa-check.d/90world-writable @@ -10,7 +10,7 @@ world_writable_check() { set -f if [[ -n ${unsafe_files} ]] ; then - eqawarn "QA Security Notice: world writable file(s):" + eqawarn "QA Notice: world writable file(s):" eqatag -v world-writable ${unsafe_files} diff --git a/bin/install-qa-check.d/95empty-dirs b/bin/install-qa-check.d/95empty-dirs index b8612bdf16..95c121817d 100644 --- a/bin/install-qa-check.d/95empty-dirs +++ b/bin/install-qa-check.d/95empty-dirs @@ -26,7 +26,7 @@ find_empty_dirs() { done < <(find "${ED}" -depth -mindepth 1 -type d -empty -print0 ${striparg} | LC_COLLATE=C sort -z) if [[ ${warn_dirs[@]} ]]; then - eqawarn "One or more empty directories installed to /var:" + eqawarn "QA Notice: One or more empty directories installed to /var:" eqawarn for d in "${warn_dirs[@]}"; do eqawarn " ${d#${ED%/}}"
