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-boot | |
| 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-boot')
| -rw-r--r-- | sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild | 2 | ||||
| -rw-r--r-- | sys-boot/lilo/lilo-24.0-r1.ebuild | 12 | ||||
| -rw-r--r-- | sys-boot/lilo/lilo-24.1.ebuild | 12 | ||||
| -rw-r--r-- | sys-boot/lilo/lilo-24.2.ebuild | 12 | ||||
| -rw-r--r-- | sys-boot/tboot/tboot-1.9.6_p20171118.ebuild | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild index cba6251a37af..b0de4bb7a385 100644 --- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild +++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild @@ -48,7 +48,7 @@ src_prepare() { src_compile() { # too many problems with parallel building - emake -j1 AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) || die "emake failed" + emake -j1 AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) } src_install() { diff --git a/sys-boot/lilo/lilo-24.0-r1.ebuild b/sys-boot/lilo/lilo-24.0-r1.ebuild index b0639924ba39..becc561f7416 100644 --- a/sys-boot/lilo/lilo-24.0-r1.ebuild +++ b/sys-boot/lilo/lilo-24.0-r1.ebuild @@ -56,24 +56,24 @@ src_compile() { local target=all fi - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die + emake CC="$(tc-getCC) ${LDFLAGS}" ${target} } src_install() { keepdir /boot - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install if use !minimal; then into / - dosbin "${WORKDIR}"/dolilo/dolilo || die + dosbin "${WORKDIR}"/dolilo/dolilo into /usr - dosbin keytab-lilo.pl || die + dosbin keytab-lilo.pl insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example || die + newins "${FILESDIR}"/lilo.conf lilo.conf.example - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die + newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example dodoc CHANGELOG* readme/README.* readme/INCOMPAT README docinto samples ; dodoc sample/* diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild index 9431f2659608..aa4787b06c10 100644 --- a/sys-boot/lilo/lilo-24.1.ebuild +++ b/sys-boot/lilo/lilo-24.1.ebuild @@ -56,24 +56,24 @@ src_compile() { local target=all fi - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die + emake CC="$(tc-getCC) ${LDFLAGS}" ${target} } src_install() { keepdir /boot - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install if use !minimal; then into / - dosbin "${WORKDIR}"/dolilo/dolilo || die + dosbin "${WORKDIR}"/dolilo/dolilo into /usr - dosbin keytab-lilo.pl || die + dosbin keytab-lilo.pl insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example || die + newins "${FILESDIR}"/lilo.conf lilo.conf.example - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die + newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example dodoc CHANGELOG* readme/README.* readme/INCOMPAT README docinto samples ; dodoc sample/* diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild index 854b8dba4364..c84d6257d959 100644 --- a/sys-boot/lilo/lilo-24.2.ebuild +++ b/sys-boot/lilo/lilo-24.2.ebuild @@ -56,24 +56,24 @@ src_compile() { local target=all fi - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die + emake CC="$(tc-getCC) ${LDFLAGS}" ${target} } src_install() { keepdir /boot - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install if use !minimal; then into / - dosbin "${WORKDIR}"/dolilo/dolilo || die + dosbin "${WORKDIR}"/dolilo/dolilo into /usr - dosbin keytab-lilo.pl || die + dosbin keytab-lilo.pl insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example || die + newins "${FILESDIR}"/lilo.conf lilo.conf.example - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die + newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example dodoc CHANGELOG* readme/README.* readme/INCOMPAT README docinto samples ; dodoc sample/* diff --git a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild b/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild index d858b8202cf6..e33aa1ee7e93 100644 --- a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild +++ b/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild @@ -51,7 +51,7 @@ src_install() { emake DISTDIR="${D}" install dodoc "${DOCS[@]}" - dodoc docs/*.txt lcptools/*.{txt,pdf} || die "docs failed" + dodoc docs/*.txt lcptools/*.{txt,pdf} cd "${D}" mkdir -p usr/lib/tboot/ || die |