From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3EC24158041 for ; Sat, 23 Mar 2024 17:04:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86FC92BC035; Sat, 23 Mar 2024 17:04:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6AF662BC035 for ; Sat, 23 Mar 2024 17:04:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86E2734300E for ; Sat, 23 Mar 2024 17:04:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 261C7156A for ; Sat, 23 Mar 2024 17:04:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1711213460.efc8afb3c59398c00fc42a06ec541bc481100873.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: efc8afb3c59398c00fc42a06ec541bc481100873 X-VCS-Branch: master Date: Sat, 23 Mar 2024 17:04:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 62f2c85c-807f-42e9-a442-c5a6964622cf X-Archives-Hash: b3590791ee96f1b177c08e3c344ca999 commit: efc8afb3c59398c00fc42a06ec541bc481100873 Author: Sam James gentoo org> AuthorDate: Sat Mar 23 17:03:50 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 23 17:04:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc8afb3 toolchain.eclass: another error handling fix This one seems to be part of the previous block and was missing a comment / had misleading whitespace. Fixes: f81ec884754b3f3d3720d40b212e12ef364821c5 Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 45e175a6092e..cd63712b1f24 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2223,8 +2223,8 @@ gcc_movelibs() { for FROMDIR in ${removedirs} ; do rmdir "${D}"${FROMDIR} >& /dev/null done - - find -depth "${ED}" -type d -exec rmdir {} + >& /dev/null || die + # XXX: Intentionally no die, here to remove empty dirs + find -depth "${ED}" -type d -exec rmdir {} + >& /dev/null } # Make sure the libtool archives have libdir set to where they actually