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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E06F1396D0 for ; Mon, 4 Sep 2017 05:54:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93CB3E0C58; Mon, 4 Sep 2017 05:54:36 +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 682BBE0C58 for ; Mon, 4 Sep 2017 05:54:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 03224341699 for ; Mon, 4 Sep 2017 05:54:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A855A8D56 for ; Mon, 4 Sep 2017 05:54:32 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1504503755.4d7d4e146bbecf6cc039ce3e5cdf89a91b751f4e.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 4d7d4e146bbecf6cc039ce3e5cdf89a91b751f4e X-VCS-Branch: master Date: Mon, 4 Sep 2017 05:54:32 +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-Archives-Salt: 36057aaa-068e-4197-b1ee-d1df4264eff9 X-Archives-Hash: 29ef3f3e84f468ba2e82905f4514a937 commit: 4d7d4e146bbecf6cc039ce3e5cdf89a91b751f4e Author: Robin H. Johnson gentoo org> AuthorDate: Mon Sep 4 05:42:35 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Sep 4 05:42:35 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4d7d4e14 gen_initramfs: catch lddtree failure. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=618056 Signed-off-by: Robin H. Johnson gentoo.org> gen_initramfs.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 62a88c8..2be35c4 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -39,11 +39,13 @@ copy_binaries() { # lddtree does not have the -V (version) nor the -l (list) options prior to version 1.18 ( if lddtree -V > /dev/null 2>&1 ; then - lddtree -l "$@" + lddtree -l "$@" \ + || gen_die "Binary ${f} or some of its library dependencies could not be copied" else lddtree "$@" \ | tr ')(' '\n' \ - | awk '/=>/{ if($3 ~ /^\//){print $3}}' + | awk '/=>/{ if($3 ~ /^\//){print $3}}' \ + || gen_die "Binary ${f} or some of its library dependencies could not be copied" fi ) \ | sort \ | uniq \