summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
committerDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
commit398a42634f34afa1979d88ae1d8b38194e911c2d (patch)
treed6a45bdf7b35b71c192602a46e8d98d12a88cb02 /sys-cluster/pacemaker
parentdev-ros/geometric_shapes: Remove old (diff)
downloadgentoo-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/pacemaker')
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.16.ebuild4
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild4
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.19.ebuild4
3 files changed, 6 insertions, 6 deletions
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
}