commit: ce929d243678a2b1a3dc05fe9a21e1bf07fbcac6 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Fri May 12 17:27:32 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sat Oct 21 08:01:24 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ce929d24
prepinfo: Ban in ebuild scope Also drop compatibility code from install_qa_check, i.e. don't recurse into subdirectories for removal of Info dir files. Closes: https://bugs.gentoo.org/899898 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> bin/ebuild-helpers/prepinfo | 36 ++---------------------------------- bin/misc-functions.sh | 13 ------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/bin/ebuild-helpers/prepinfo b/bin/ebuild-helpers/prepinfo index af5ae9f088..80fcecba60 100755 --- a/bin/ebuild-helpers/prepinfo +++ b/bin/ebuild-helpers/prepinfo @@ -4,37 +4,5 @@ source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 -eqawarn "QA Notice: '${0##*/}' is not allowed in ebuild scope" - -if ! ___eapi_has_prefix_variables ; then - ED=${D} -fi - -if [[ -z ${1} ]] ; then - infodir="/usr/share/info" -else - if [[ -d ${ED%/}/${1#/}/share/info ]] ; then - infodir="${1#/}/share/info" - else - infodir="${1#/}/info" - fi -fi - -if [[ ! -d ${ED%/}/${infodir#/} ]] ; then - if [[ -n $1 ]] ; then - __vecho "${0##*/}: '${infodir}' does not exist!" - exit 1 - else - exit 0 - fi -fi - -find "${ED%/}/${infodir#/}" -type d -print0 | while read -r -d $'\0' x ; do - for f in "${x}"/.keepinfodir*; do - [[ -e ${f} ]] && continue 2 - done - - rm -f "${x}"/dir{,.info}{,.Z,.gz,.bz2,.lzma,.lz,.xz,.zst} -done - -exit 0 +die "'${0##*/}' is not allowed in ebuild scope" +exit 1 diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index d9319d5af8..4ce3acbfdc 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -147,19 +147,6 @@ install_qa_check() { # Portage regenerates this on the installed system. rm -f "${ED%/}"/usr/share/info/dir{,.info}{,.Z,.gz,.bz2,.lzma,.lz,.xz,.zst} \ || die "rm failed" - # Recurse into subdirs. Remove this code after 2023-12-31. #899898 - while read -r -d '' x; do - ( shopt -s failglob; : "${x}"/.keepinfodir* ) 2>/dev/null \ - && continue - for f in "${x}"/dir{,.info}{,.Z,.gz,.bz2,.lzma,.lz,.xz,.zst}; do - if [[ -e ${f} ]]; then - eqawarn "QA Notice: Removing Info directory file '${f}'." - eqawarn "Relying on this behavior is deprecated and may" - eqawarn "cause file collisions in future." - rm -f "${f}" || die "rm failed" - fi - done - done < <(find "${ED%/}"/usr/share/info -mindepth 1 -type d -print0) fi # If binpkg-docompress is enabled, apply compression before creating
