Gentoo Archives: gentoo-commits

From: Thomas Sachau <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:multilib commit in: bin/
Date: Sun, 07 Jan 2018 09:30:22
Message-Id: 1495874701.cc9000526ff239994ae2050c2df9f2e6f6512055.tommy@gentoo
1 commit: cc9000526ff239994ae2050c2df9f2e6f6512055
2 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 27 08:45:01 2017 +0000
4 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
5 CommitDate: Sat May 27 08:45:01 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc900052
7
8 Check for symlink instead of existing target (of symlink)
9
10 bin/auto-multilib.sh | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13 diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
14 index c17c2e8e8..b5043e041 100755
15 --- a/bin/auto-multilib.sh
16 +++ b/bin/auto-multilib.sh
17 @@ -269,12 +269,12 @@ _finalize_abi_install() {
18 if [ "${ABI}" != "${first_installed_abi}" ]; then
19 __vecho ">>> Removing installed symlinks $(_get_abi_string)"
20 for i in $(find ${D} -type l) ; do
21 - [[ -e "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
22 + [[ -L "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
23 done
24 fi
25
26 # Create wrapper symlink for *-config files
27 - local i=
28 + local i=
29 prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin -type f -name '*-config' 2>/dev/null)
30
31 local noabi=()