From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-995966-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 5E123138330
	for <garchives@archives.gentoo.org>; Sun,  7 Jan 2018 09:30:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C25E9E0893;
	Sun,  7 Jan 2018 09:30:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id A4820E0893
	for <gentoo-commits@lists.gentoo.org>; Sun,  7 Jan 2018 09:30:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id AC415335DA3
	for <gentoo-commits@lists.gentoo.org>; Sun,  7 Jan 2018 09:30:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 03EAD147
	for <gentoo-commits@lists.gentoo.org>; Sun,  7 Jan 2018 09:30:19 +0000 (UTC)
From: "Thomas Sachau" <tommy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" <tommy@gentoo.org>
Message-ID: <1495874701.cc9000526ff239994ae2050c2df9f2e6f6512055.tommy@gentoo>
Subject: [gentoo-commits] proj/portage:multilib commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/auto-multilib.sh
X-VCS-Directories: bin/
X-VCS-Committer: tommy
X-VCS-Committer-Name: Thomas Sachau
X-VCS-Revision: cc9000526ff239994ae2050c2df9f2e6f6512055
X-VCS-Branch: multilib
Date: Sun,  7 Jan 2018 09:30:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b4ee3355-ffd7-416b-a1ea-c4b096722082
X-Archives-Hash: 1054c31eb060dabf44859e57dbcf243a

commit:     cc9000526ff239994ae2050c2df9f2e6f6512055
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 08:45:01 2017 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 27 08:45:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc900052

Check for symlink instead of existing target (of symlink)

 bin/auto-multilib.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index c17c2e8e8..b5043e041 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -269,12 +269,12 @@ _finalize_abi_install() {
 	if [ "${ABI}" != "${first_installed_abi}" ]; then
 		__vecho ">>> Removing installed symlinks $(_get_abi_string)"
 		for i in $(find ${D} -type l) ; do
-			[[ -e "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
+			[[ -L "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
 		done
 	fi
 
 	# Create wrapper symlink for *-config files
-	local i= 
+	local i=
 	prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin -type f -name '*-config' 2>/dev/null)
 
 	local noabi=()