diff options
author | David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
commit | 398a42634f34afa1979d88ae1d8b38194e911c2d (patch) | |
tree | d6a45bdf7b35b71c192602a46e8d98d12a88cb02 /www-servers | |
parent | dev-ros/geometric_shapes: Remove old (diff) | |
download | gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.gz gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.bz2 gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.zip |
*/*: [QA] Remove redundant `|| die` guards
* 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>
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/gatling/gatling-0.15.ebuild | 17 | ||||
-rw-r--r-- | www-servers/ocsigenserver/ocsigenserver-2.8.ebuild | 4 | ||||
-rw-r--r-- | www-servers/ocsigenserver/ocsigenserver-9999.ebuild | 4 | ||||
-rw-r--r-- | www-servers/resin/resin-4.0.48-r1.ebuild | 2 | ||||
-rw-r--r-- | www-servers/servefile/servefile-0.4.4.ebuild | 4 |
5 files changed, 15 insertions, 16 deletions
diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild index b404cfd8a5c9..ba78c1bb2f64 100644 --- a/www-servers/gatling/gatling-0.15.ebuild +++ b/www-servers/gatling/gatling-0.15.ebuild @@ -41,21 +41,20 @@ src_compile() { emake DIET="${DIET}" CC="$(tc-getCC)" \ CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \ - LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \ - || die "emake ${targets} failed" + LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} } src_install() { - doman gatling.1 || die "installing manpage failed" + doman gatling.1 - newconfd "${FILESDIR}/gatling.confd" gatling || die - newinitd "${FILESDIR}/gatling.initd-3" gatling || die - dodoc README.{ftp,http} || die "installing docs failed" + newconfd "${FILESDIR}/gatling.confd" gatling + newinitd "${FILESDIR}/gatling.initd-3" gatling + dodoc README.{ftp,http} - dobin gatling || die "installing gatling binary failed" + dobin gatling use ssl && { - dodoc README.tls || die "installing docs failed" - dobin tlsgatling || die "installing tlsgatling binary failed" + dodoc README.tls + dobin tlsgatling } } diff --git a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild index 6f80dda9a2fd..19602549a243 100644 --- a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild +++ b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild @@ -90,8 +90,8 @@ src_install() { fi emake logrotate - newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die - newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die + newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver + newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver dodoc README.md diff --git a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild index 6f80dda9a2fd..19602549a243 100644 --- a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild +++ b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild @@ -90,8 +90,8 @@ src_install() { fi emake logrotate - newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die - newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die + newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver + newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver dodoc README.md diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild index ad098405d02f..f6273d76edc8 100644 --- a/www-servers/resin/resin-4.0.48-r1.ebuild +++ b/www-servers/resin/resin-4.0.48-r1.ebuild @@ -78,7 +78,7 @@ src_configure() { append-flags -fPIC -DPIC chmod 755 "${S}/configure" || die - econf --prefix=${RESIN_HOME} || die "econf failed" + econf --prefix=${RESIN_HOME} } src_compile() { diff --git a/www-servers/servefile/servefile-0.4.4.ebuild b/www-servers/servefile/servefile-0.4.4.ebuild index 268ad61c03c7..3766aa87b240 100644 --- a/www-servers/servefile/servefile-0.4.4.ebuild +++ b/www-servers/servefile/servefile-0.4.4.ebuild @@ -25,6 +25,6 @@ RDEPEND=" src_install() { distutils-r1_src_install - dodoc ChangeLog || die - doman ${PN}.1 || die + dodoc ChangeLog + doman ${PN}.1 } |