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 /sys-cluster | |
| 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 'sys-cluster')
30 files changed, 47 insertions, 47 deletions
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild index a8286bdae265..1b4e7d2933cc 100644 --- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild +++ b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild @@ -78,7 +78,7 @@ src_install() { sed -i \ -e "s:%libdir%:$(get_libdir):" \ "${T}/heartbeat-logd.init" || die -# newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die +# newinitd "${T}/heartbeat-logd.init" heartbeat-logd rm "${D}"/etc/init.d/logd use static-libs || find "${D}" -type f -name "*.la" -delete diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild index ad5e78db7935..c067016843b1 100644 --- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild +++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild @@ -85,7 +85,7 @@ src_install() { sed -i \ -e "s:%libdir%:$(get_libdir):" \ "${T}/heartbeat-logd.init" || die -# newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die +# newinitd "${T}/heartbeat-logd.init" heartbeat-logd rm "${D}"/etc/init.d/logd use static-libs || find "${D}" -type f -name "*.la" -delete diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild index de7e47b7ac8d..55d62dcee077 100644 --- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild +++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild @@ -79,7 +79,7 @@ src_install() { sed -i \ -e "s:%libdir%:$(get_libdir):" \ "${T}/heartbeat-logd.init" || die -# newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die +# newinitd "${T}/heartbeat-logd.init" heartbeat-logd rm "${D}"/etc/init.d/logd use static-libs || find "${D}" -type f -name "*.la" -delete diff --git a/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild b/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild index cf52cb43963a..5509498cc08a 100644 --- a/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild +++ b/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild @@ -67,11 +67,11 @@ src_compile() { src_install() { local exdir=/usr/share/doc/${P} - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install newinitd "${FILESDIR}"/gmond.rc-2 gmond - doman {mans/*.1,gmond/*.5} || die "Failed to install manpages" - dodoc AUTHORS INSTALL NEWS README || die + doman {mans/*.1,gmond/*.5} + dodoc AUTHORS INSTALL NEWS README dodir /etc/ganglia/conf.d use python && dodir /usr/$(get_libdir)/ganglia/python_modules diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild index 20aadc77cebf..d0a16996c2b3 100644 --- a/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild +++ b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild @@ -81,6 +81,6 @@ src_install() { fi if use doc ; then - dodoc README doc/*.txt doc/AUTHORS || die + dodoc README doc/*.txt doc/AUTHORS fi } diff --git a/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild index f4ea34d9baf5..26457bab784e 100644 --- a/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild +++ b/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild @@ -79,6 +79,6 @@ src_install() { fi if use doc ; then - dodoc README doc/*.txt doc/AUTHORS || die + dodoc README doc/*.txt doc/AUTHORS fi } diff --git a/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild index 87b148818ad4..1d86b2f1ab01 100644 --- a/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild +++ b/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild @@ -80,6 +80,6 @@ src_install() { fi if use doc ; then - dodoc README doc/*.txt doc/AUTHORS || die + dodoc README doc/*.txt doc/AUTHORS fi } diff --git a/sys-cluster/maui/maui-3.3.1-r2.ebuild b/sys-cluster/maui/maui-3.3.1-r2.ebuild index f14cfeaf5d75..af2623ae6e15 100644 --- a/sys-cluster/maui/maui-3.3.1-r2.ebuild +++ b/sys-cluster/maui/maui-3.3.1-r2.ebuild @@ -47,10 +47,10 @@ src_configure() { } src_install() { - emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install || die - dodoc docs/README CHANGELOG || die - dohtml docs/mauidocs.html || die - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install + dodoc docs/README CHANGELOG + dohtml docs/mauidocs.html + newinitd "${FILESDIR}/${PN}.initd" ${PN} } pkg_nofetch() { diff --git a/sys-cluster/maui/maui-3.3.1-r3.ebuild b/sys-cluster/maui/maui-3.3.1-r3.ebuild index 8f5c03da2d52..82459ce3849b 100644 --- a/sys-cluster/maui/maui-3.3.1-r3.ebuild +++ b/sys-cluster/maui/maui-3.3.1-r3.ebuild @@ -49,10 +49,10 @@ src_configure() { } src_install() { - emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install || die - dodoc docs/README CHANGELOG || die - dohtml docs/mauidocs.html || die - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install + dodoc docs/README CHANGELOG + dohtml docs/mauidocs.html + newinitd "${FILESDIR}/${PN}.initd" ${PN} } pkg_nofetch() { diff --git a/sys-cluster/mvapich2/mvapich2-1.6.ebuild b/sys-cluster/mvapich2/mvapich2-1.6.ebuild index 6277a6a7a4c0..d5bc03fc1b7d 100644 --- a/sys-cluster/mvapich2/mvapich2-1.6.ebuild +++ b/sys-cluster/mvapich2/mvapich2-1.6.ebuild @@ -125,7 +125,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}"|| die + emake DESTDIR="${D}" dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \ README* RELEASE_NOTES* } diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild index 8bf92f0e2f57..db37d6581843 100644 --- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild +++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild @@ -91,11 +91,11 @@ src_configure() { } src_install () { - emake DESTDIR="${D}" install || die "make install failed" - dodoc README AUTHORS NEWS VERSION || die + emake DESTDIR="${D}" install + dodoc README AUTHORS NEWS VERSION } src_test() { # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check || die "emake check failed" + emake -j1 check } diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild index ad3f8b66f21a..0bbe9b66f66f 100644 --- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild +++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild @@ -93,11 +93,11 @@ src_configure() { } src_install () { - emake DESTDIR="${D}" install || die "make install failed" - dodoc README AUTHORS NEWS VERSION || die + emake DESTDIR="${D}" install + dodoc README AUTHORS NEWS VERSION } src_test() { # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check || die "emake check failed" + emake -j1 check } diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild index 94fbe5f02330..df2aebcc202a 100644 --- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild @@ -155,13 +155,13 @@ src_configure() { } src_install () { - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install # From USE=vt see #359917 rm "${ED}"/usr/share/libtool &> /dev/null - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check || die "emake check failed" + emake -j1 check } diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild index 0c59f5e20d45..3ac5a69985c9 100644 --- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild @@ -152,7 +152,7 @@ src_install () { rm "${ED}"/usr/share/libtool &> /dev/null # Avoid collisions with libevent rm -rf "${ED}"/usr/include/event2 &> /dev/null - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild index b445c75dae49..2c81eb423270 100644 --- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild @@ -157,7 +157,7 @@ src_install () { # Remove la files, no static libs are installed and we have pkg-config find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild index 876003287360..95e3f08eb07e 100644 --- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild @@ -170,7 +170,7 @@ src_install () { rm "${mpi_jar}" || die fi - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild index 0907f4880539..df5defd234e3 100644 --- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild @@ -170,7 +170,7 @@ src_install () { rm "${mpi_jar}" || die fi - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild index 019e26300394..f58cbbd86bea 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild @@ -68,9 +68,9 @@ src_configure() { src_install() { default rm -rf "${D}"/var/run "${D}"/etc/init.d - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + newinitd "${FILESDIR}/${PN}.initd" ${PN} if has_version "<sys-cluster/corosync-2.0"; then insinto /etc/corosync/service.d - newins "${FILESDIR}/${PN}.service" ${PN} || die + newins "${FILESDIR}/${PN}.service" ${PN} fi } diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild index ed65ac8337a0..879fa861bc17 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild @@ -71,10 +71,10 @@ src_configure() { src_install() { default rm -rf "${D}/var/run" "${D}/etc/init.d" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" || die + newinitd "${FILESDIR}/${PN}.initd" "${PN}" if has_version "<sys-cluster/corosync-2.0"; then insinto /etc/corosync/service.d - newins "${FILESDIR}/${PN}.service" "${PN}" || die + newins "${FILESDIR}/${PN}.service" "${PN}" fi find "${D}" -name '*.la' -delete || die } diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild index 610fa658e5fc..eea845a19fe1 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild @@ -68,9 +68,9 @@ src_configure() { src_install() { default rm -rf "${D}"/var/run "${D}"/etc/init.d - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + newinitd "${FILESDIR}/${PN}.initd" ${PN} if has_version "<sys-cluster/corosync-2.0"; then insinto /etc/corosync/service.d - newins "${FILESDIR}/${PN}.service" ${PN} || die + newins "${FILESDIR}/${PN}.service" ${PN} fi } diff --git a/sys-cluster/swift/swift-2.21.0-r1.ebuild b/sys-cluster/swift/swift-2.21.0-r1.ebuild index 25a2b591ac5e..e0892e4069a1 100644 --- a/sys-cluster/swift/swift-2.21.0-r1.ebuild +++ b/sys-cluster/swift/swift-2.21.0-r1.ebuild @@ -114,7 +114,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/swift/swift-2.22.0.ebuild b/sys-cluster/swift/swift-2.22.0.ebuild index a88677f29fd8..9a409be64721 100644 --- a/sys-cluster/swift/swift-2.22.0.ebuild +++ b/sys-cluster/swift/swift-2.22.0.ebuild @@ -112,7 +112,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/swift/swift-2.23.1.ebuild b/sys-cluster/swift/swift-2.23.1.ebuild index aaecc71181d4..3e3deb94d7f2 100644 --- a/sys-cluster/swift/swift-2.23.1.ebuild +++ b/sys-cluster/swift/swift-2.23.1.ebuild @@ -112,7 +112,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/swift/swift-2019.1.9999.ebuild b/sys-cluster/swift/swift-2019.1.9999.ebuild index ec5ee0cd41ee..537207edd2a7 100644 --- a/sys-cluster/swift/swift-2019.1.9999.ebuild +++ b/sys-cluster/swift/swift-2019.1.9999.ebuild @@ -114,7 +114,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild b/sys-cluster/swift/swift-2019.2.9999.ebuild index 73b14dde3ae6..d90ce6aa21ec 100644 --- a/sys-cluster/swift/swift-2019.2.9999.ebuild +++ b/sys-cluster/swift/swift-2019.2.9999.ebuild @@ -112,7 +112,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild index dee0715397e4..c38cff22bd46 100644 --- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild +++ b/sys-cluster/wulfware/wulfware-2.6.0.ebuild @@ -47,7 +47,7 @@ src_compile() { src_install() { emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \ includedir="${D}/usr/include" sysconfdir="${D}/etc" \ - install || die "emake install failed." + install dodoc AUTHORS ChangeLog NEWS NOTES README xmlsysd/DESIGN diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild index bc0ae0982c2b..8f6e4bd484fb 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild @@ -86,5 +86,5 @@ src_install() { PATH=${INSTALL_DIR}/bin CONFIG_PROTECT=${INSTALL_DIR}/conf EOF - doenvd 99"${PN}" || die "doenvd failed" + doenvd 99"${PN}" } diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild index bc0ae0982c2b..8f6e4bd484fb 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild @@ -86,5 +86,5 @@ src_install() { PATH=${INSTALL_DIR}/bin CONFIG_PROTECT=${INSTALL_DIR}/conf EOF - doenvd 99"${PN}" || die "doenvd failed" + doenvd 99"${PN}" } diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild index a35bfb4d98d4..a68eac797592 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild @@ -86,5 +86,5 @@ src_install() { PATH=${INSTALL_DIR}/bin CONFIG_PROTECT=${INSTALL_DIR}/conf EOF - doenvd 99"${PN}" || die "doenvd failed" + doenvd 99"${PN}" } diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild index 0ed0f10b5ef0..d911c9fc1da5 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild @@ -89,5 +89,5 @@ src_install() { PATH=${INSTALL_DIR}/bin CONFIG_PROTECT=${INSTALL_DIR}/conf EOF - doenvd 99"${PN}" || die "doenvd failed" + doenvd 99"${PN}" } |