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 /app-emulation
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 'app-emulation')
-rw-r--r--app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild2
-rw-r--r--app-emulation/docker-machine/docker-machine-0.13.0.ebuild2
-rw-r--r--app-emulation/docker/docker-18.09.9.ebuild2
-rw-r--r--app-emulation/docker/docker-19.03.4.ebuild2
-rw-r--r--app-emulation/docker/docker-19.03.5.ebuild2
-rw-r--r--app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild2
-rw-r--r--app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild2
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r8.ebuild2
-rw-r--r--app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild2
-rw-r--r--app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild2
-rw-r--r--app-emulation/libvirt/libvirt-5.2.0-r2.ebuild14
-rw-r--r--app-emulation/libvirt/libvirt-5.5.0-r1.ebuild14
-rw-r--r--app-emulation/libvirt/libvirt-5.6.0.ebuild14
-rw-r--r--app-emulation/libvirt/libvirt-5.8.0.ebuild14
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild14
-rw-r--r--app-emulation/lxd/lxd-3.16-r1.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild2
21 files changed, 51 insertions, 51 deletions
diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
index 509420dad7c1..20d5054f6d83 100644
--- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
+++ b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
src_compile() {
export GOPATH=${S}
cd "${S}"/src/${EGO_PN}/cmd/${PN/kvm/driver-kvm} || die
- emake build || die
+ emake build
}
src_install() {
diff --git a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
index 974d8a443e7f..1cfa0ea229cc 100644
--- a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
+++ b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
}
src_compile() {
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build || die
+ CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build
}
src_install() {
diff --git a/app-emulation/docker/docker-18.09.9.ebuild b/app-emulation/docker/docker-18.09.9.ebuild
index 86284c9e3965..966a693d1a49 100644
--- a/app-emulation/docker/docker-18.09.9.ebuild
+++ b/app-emulation/docker/docker-18.09.9.ebuild
@@ -235,7 +235,7 @@ src_compile() {
VERSION="$(cat ../../VERSION)" \
GITCOMMIT="${DOCKER_GITCOMMIT}" \
DISABLE_WARN_OUTSIDE_CONTAINER=1 \
- dynbinary || die
+ dynbinary
# build man pages
go build -o gen-manpages github.com/docker/cli/man || die
diff --git a/app-emulation/docker/docker-19.03.4.ebuild b/app-emulation/docker/docker-19.03.4.ebuild
index 8d52724b145c..af88214fce00 100644
--- a/app-emulation/docker/docker-19.03.4.ebuild
+++ b/app-emulation/docker/docker-19.03.4.ebuild
@@ -236,7 +236,7 @@ src_compile() {
VERSION="$(cat ../../VERSION)" \
GITCOMMIT="${DOCKER_GITCOMMIT}" \
DISABLE_WARN_OUTSIDE_CONTAINER=1 \
- dynbinary || die
+ dynbinary
# build man pages
go build -o gen-manpages github.com/docker/cli/man || die
diff --git a/app-emulation/docker/docker-19.03.5.ebuild b/app-emulation/docker/docker-19.03.5.ebuild
index 16734cab2072..e6fb4da81b09 100644
--- a/app-emulation/docker/docker-19.03.5.ebuild
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -236,7 +236,7 @@ src_compile() {
VERSION="$(cat ../../VERSION)" \
GITCOMMIT="${DOCKER_GITCOMMIT}" \
DISABLE_WARN_OUTSIDE_CONTAINER=1 \
- dynbinary || die
+ dynbinary
# build man pages
go build -o gen-manpages github.com/docker/cli/man || die
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
index d60896758bb0..45a28c15d3cb 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
@@ -39,7 +39,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" install
rm -rf "${D}"/usr/share/doc/${PN}
dodoc README.markdown NEWS ChangeLog
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
index 760dd5928a14..e621e1ec228e 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
@@ -40,7 +40,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" install
rm -rf "${D}"/usr/share/doc/${PN}
dodoc README.markdown NEWS ChangeLog
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
index 886e0a9ebaec..6e00659d3fde 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -375,5 +375,5 @@ src_test () {
PATH="${S}/scripts:${S}/src:${PATH}" \
TMPDIR="/tmp" \
GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
+ emake check
}
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 2a860fdfd716..bd24dd3fff74 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -346,5 +346,5 @@ src_test () {
PATH="${S}/scripts:${S}/src:${PATH}" \
TMPDIR="/tmp" \
GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
+ emake check
}
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index ef5c738ba9be..d4baca0d24bf 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -346,5 +346,5 @@ src_test () {
PATH="${S}/scripts:${S}/src:${PATH}" \
TMPDIR="/tmp" \
GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
+ emake check
}
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index d03db5f55c6b..90133363bafa 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -327,7 +327,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -352,13 +352,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index 581677ab6175..5fd272b35627 100644
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -322,7 +322,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -347,13 +347,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild
index 07d39538452f..5fd58c94d1c2 100644
--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild
@@ -322,7 +322,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -347,13 +347,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild
index d878aa6e027e..5bec3ede6039 100644
--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild
@@ -325,7 +325,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -351,13 +351,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 4191f89dc94a..4761c3ff2cfc 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -322,7 +322,7 @@ my_src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
my_src_install() {
@@ -347,13 +347,13 @@ my_src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/lxd/lxd-3.16-r1.ebuild b/app-emulation/lxd/lxd-3.16-r1.ebuild
index 28b5695b2e9d..6f15ebbce927 100644
--- a/app-emulation/lxd/lxd-3.16-r1.ebuild
+++ b/app-emulation/lxd/lxd-3.16-r1.ebuild
@@ -191,7 +191,7 @@ src_install() {
emake DESTDIR="${D}" install
cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir"
- dolib.so libco.so || die "Can't install libco.so"
+ dolib.so libco.so
cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
emake DESTDIR="${D}" install
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild
index de48142651ba..2ed1560fbf7a 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild
index cb4e5663f7c1..ba106a9145dd 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
index ea3b735a7474..d236726f6ef9 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild
index ea3b735a7474..d236726f6ef9 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild
index bbdbcba3f7fc..d9a9191934c6 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so