From 398a42634f34afa1979d88ae1d8b38194e911c2d Mon Sep 17 00:00:00 2001 From: David Seifert 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 Reviewed-by: Michał Górny Reviewed-by: Andreas K. Hüttel Signed-off-by: David Seifert --- net-mail/autorespond/autorespond-2.0.4.ebuild | 4 ++-- net-mail/autorespond/autorespond-2.0.5.ebuild | 4 ++-- net-mail/offlineimap/offlineimap-6.5.6.ebuild | 2 +- net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild | 7 +++---- net-mail/renattach/renattach-1.2.4-r1.ebuild | 4 ++-- net-mail/rss2email/rss2email-2.71-r1.ebuild | 8 ++++---- net-mail/sendEmail/sendEmail-1.56-r1.ebuild | 2 +- net-mail/sendEmail/sendEmail-1.56-r2.ebuild | 2 +- net-mail/swaks/swaks-20130209.0-r1.ebuild | 6 +++--- 9 files changed, 19 insertions(+), 20 deletions(-) (limited to 'net-mail') diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild index 94509c8a81be..d3be500ebcd5 100644 --- a/net-mail/autorespond/autorespond-2.0.4.ebuild +++ b/net-mail/autorespond/autorespond-2.0.4.ebuild @@ -19,12 +19,12 @@ PATCHES=( DOCS=( README help_message qmail-auto ChangeLog ) src_compile() { - emake CFLAGS="${CFLAGS}" || die + emake CFLAGS="${CFLAGS}" } src_install () { into /var/qmail - dobin autorespond || die "dobin failed" + dobin autorespond doman *.1 einstalldocs } diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild index 813522f4365b..5e32640b6e10 100644 --- a/net-mail/autorespond/autorespond-2.0.5.ebuild +++ b/net-mail/autorespond/autorespond-2.0.5.ebuild @@ -18,12 +18,12 @@ PATCHES=( DOCS=( README help_message qmail-auto ) src_compile() { - emake CFLAGS="${CFLAGS}" || die + emake CFLAGS="${CFLAGS}" } src_install () { into /var/qmail - dobin autorespond || die "dobin failed" + dobin autorespond doman *.1 einstalldocs } diff --git a/net-mail/offlineimap/offlineimap-6.5.6.ebuild b/net-mail/offlineimap/offlineimap-6.5.6.ebuild index 8c7b027d79a2..960a6e04aad2 100644 --- a/net-mail/offlineimap/offlineimap-6.5.6.ebuild +++ b/net-mail/offlineimap/offlineimap-6.5.6.ebuild @@ -47,7 +47,7 @@ src_install() { dodoc offlineimap.conf offlineimap.conf.minimal if use doc ; then cd docs - doman offlineimap.1 || die "installing manpage failed" + doman offlineimap.1 fi } diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild index 89c00b0fa817..4c233e12778f 100644 --- a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild +++ b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild @@ -26,10 +26,9 @@ src_prepare() { } src_install() { - dosbin pop-before-smtp || die "dosbin failed" + dosbin pop-before-smtp dodoc README ChangeLog TODO contrib/README.QUICKSTART insinto /etc - doins pop-before-smtp-conf.pl || die "doins failed" - newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp \ - || die "newinitd failed" + doins pop-before-smtp-conf.pl + newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp } diff --git a/net-mail/renattach/renattach-1.2.4-r1.ebuild b/net-mail/renattach/renattach-1.2.4-r1.ebuild index d89611b23f15..229c8450c7cc 100644 --- a/net-mail/renattach/renattach-1.2.4-r1.ebuild +++ b/net-mail/renattach/renattach-1.2.4-r1.ebuild @@ -13,9 +13,9 @@ KEYWORDS="~amd64 ~x86" IUSE="" src_install () { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install mv "${D}"/etc/renattach.conf.ex "${D}"/etc/renattach.conf || die - dodoc AUTHORS ChangeLog README NEWS || die + dodoc AUTHORS ChangeLog README NEWS } diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild index 1fbb40b32186..215277e290fb 100644 --- a/net-mail/rss2email/rss2email-2.71-r1.ebuild +++ b/net-mail/rss2email/rss2email-2.71-r1.ebuild @@ -50,10 +50,10 @@ src_install() { python_foreach_impl my_install insinto /etc/${PN} - doins config.py.example || die + doins config.py.example - dodoc CHANGELOG readme.html || die - doman r2e.1 || die + dodoc CHANGELOG readme.html + doman r2e.1 # Replace r2e wrapper cat <<-"EOF" >r2e @@ -64,5 +64,5 @@ src_install() { exec python2 "${SITE_PACKAGES}"/rss2email/main.py "${CONF_DIR}"/feeds.dat $* EOF - dobin r2e || die + dobin r2e } diff --git a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild index 65f4ff4912fc..acc2cc71391d 100644 --- a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild +++ b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild @@ -23,6 +23,6 @@ PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" ) S="${WORKDIR}/${MY_P}" src_install() { - dobin sendEmail || die "failed to install sendEmail script" + dobin sendEmail dodoc CHANGELOG README TODO } diff --git a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild index aaa924980ff6..8b8af8e7a317 100644 --- a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild +++ b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild @@ -24,6 +24,6 @@ PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" S="${WORKDIR}/${MY_P}" src_install() { - dobin sendEmail || die "failed to install sendEmail script" + dobin sendEmail dodoc CHANGELOG README TODO } diff --git a/net-mail/swaks/swaks-20130209.0-r1.ebuild b/net-mail/swaks/swaks-20130209.0-r1.ebuild index cfbd70a84663..069127b07c96 100644 --- a/net-mail/swaks/swaks-20130209.0-r1.ebuild +++ b/net-mail/swaks/swaks-20130209.0-r1.ebuild @@ -35,7 +35,7 @@ src_compile() { } src_install() { - newbin swaks swaks || die "newbin failed" - doman swaks.1 || die - dodoc README doc/*.txt || die + newbin swaks swaks + doman swaks.1 + dodoc README doc/*.txt } -- cgit v1.2.3-65-gdbad