From 398a42634f34afa1979d88ae1d8b38194e911c2d Mon Sep 17 00:00:00 2001 From: David Seifert <soap@gentoo.org> Date: Wed, 11 Dec 2019 13:32:00 +0100 Subject: */*: [QA] Remove redundant `|| die` guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Since all ebuilds in the tree are EAPI>=4, `|| die` on builtin commands is redundant and dead code. Closes: https://github.com/gentoo/gentoo/pull/13940 Reviewed-by: Ulrich Müller <ulm@gentoo.org> Reviewed-by: Michał Górny <mgorny@gentoo.org> Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org> Signed-off-by: David Seifert <soap@gentoo.org> --- net-wireless/airtraf/airtraf-1.1-r3.ebuild | 3 +-- net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild | 2 +- net-wireless/rfkill/rfkill-0.5-r2.ebuild | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'net-wireless') diff --git a/net-wireless/airtraf/airtraf-1.1-r3.ebuild b/net-wireless/airtraf/airtraf-1.1-r3.ebuild index a300d2391bbd..2556d4e95885 100644 --- a/net-wireless/airtraf/airtraf-1.1-r3.ebuild +++ b/net-wireless/airtraf/airtraf-1.1-r3.ebuild @@ -43,8 +43,7 @@ src_compile() { CXX=$(tc-getCXX) \ CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - || die + LDFLAGS="${LDFLAGS}" } src_install () { diff --git a/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild b/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild index 4d649f9e0ea5..e82cf16252f2 100644 --- a/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild +++ b/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild @@ -24,7 +24,7 @@ src_prepare() { } src_install() { - emake install || die + emake install } pkg_postinst() { diff --git a/net-wireless/rfkill/rfkill-0.5-r2.ebuild b/net-wireless/rfkill/rfkill-0.5-r2.ebuild index ab6b3fa74faf..ac0d53456b95 100644 --- a/net-wireless/rfkill/rfkill-0.5-r2.ebuild +++ b/net-wireless/rfkill/rfkill-0.5-r2.ebuild @@ -18,9 +18,9 @@ RDEPEND="!>=sys-apps/util-linux-2.31_rc1" DEPEND="" src_compile() { - emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 || die "Failed to compile" + emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 } src_install() { - emake install V=1 DESTDIR="${D}" || die "Failed to install" + emake install V=1 DESTDIR="${D}" } -- cgit v1.2.3-65-gdbad