commit: f2ce3c6afffc66326db15f564e8e2aac8778ad26 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Nov 24 19:46:40 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Nov 24 19:52:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ce3c6a
sys-libs/libxcrypt: rework broken symlink detection Use the GNU-specific find -xtype option; PMS says GNU find is required. Ensure arguments are properlty quoted. Consolidate output to one line per broken link. Closes: https://bugs.gentoo.org/882801 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 20 ++++++++++---------- sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 20 ++++++++++---------- sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild index 8f335d8027ca..581dc70c0fd7 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild @@ -304,17 +304,17 @@ pkg_preinst() { # is cleaned up in *_src_install. local broken_symlinks=() mapfile -d '' broken_symlinks < <( - find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null + find "${ED}" -xtype l -print0 ) - [[ -z "${broken_symlinks[@]}" ]] && return - - eerror "Broken symlinks found before merging!" - for symlink in "${broken_symlinks[@]}" ; do - bad_dest="$(readlink -f ${symlink})" - eerror "\t${symlink} is broken!" - eerror "\treadlink -f ${symlink}:" - eerror "\t\t${bad_dest}" + if [[ ${#broken_symlinks[@]} -gt 0 ]]; then + eerror "Broken symlinks found before merging!" + local symlink target resolved + for symlink in "${broken_symlinks[@]}" ; do + target="$(readlink "${symlink}")" + resolved="$(readlink -f "${symlink}")" + eerror " '${symlink}' -> '${target}' (${resolved})" + done die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug." - done + fi } diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild index 5e72a74c6d85..755fdd744e22 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild @@ -320,17 +320,17 @@ pkg_preinst() { # is cleaned up in *_src_install. local broken_symlinks=() mapfile -d '' broken_symlinks < <( - find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null + find "${ED}" -xtype l -print0 ) - [[ -z "${broken_symlinks[@]}" ]] && return - - eerror "Broken symlinks found before merging!" - for symlink in "${broken_symlinks[@]}" ; do - bad_dest="$(readlink -f ${symlink})" - eerror "\t${symlink} is broken!" - eerror "\treadlink -f ${symlink}:" - eerror "\t\t${bad_dest}" + if [[ ${#broken_symlinks[@]} -gt 0 ]]; then + eerror "Broken symlinks found before merging!" + local symlink target resolved + for symlink in "${broken_symlinks[@]}" ; do + target="$(readlink "${symlink}")" + resolved="$(readlink -f "${symlink}")" + eerror " '${symlink}' -> '${target}' (${resolved})" + done die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug." - done + fi } diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild index d0bd8a723065..0e077bd372ed 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild @@ -315,17 +315,17 @@ pkg_preinst() { # is cleaned up in *_src_install. local broken_symlinks=() mapfile -d '' broken_symlinks < <( - find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null + find "${ED}" -xtype l -print0 ) - [[ -z "${broken_symlinks[@]}" ]] && return - - eerror "Broken symlinks found before merging!" - for symlink in "${broken_symlinks[@]}" ; do - bad_dest="$(readlink -f ${symlink})" - eerror "\t${symlink} is broken!" - eerror "\treadlink -f ${symlink}:" - eerror "\t\t${bad_dest}" + if [[ ${#broken_symlinks[@]} -gt 0 ]]; then + eerror "Broken symlinks found before merging!" + local symlink target resolved + for symlink in "${broken_symlinks[@]}" ; do + target="$(readlink "${symlink}")" + resolved="$(readlink -f "${symlink}")" + eerror " '${symlink}' -> '${target}' (${resolved})" + done die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug." - done + fi }
