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 /app-portage | |
| 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 'app-portage')
| -rw-r--r-- | app-portage/demerge/demerge-0.047-r3.ebuild | 2 | ||||
| -rw-r--r-- | app-portage/g-octave/g-octave-0.4.1-r6.ebuild | 4 | ||||
| -rw-r--r-- | app-portage/genlop/genlop-0.30.9-r1.ebuild | 2 | ||||
| -rw-r--r-- | app-portage/getdelta/getdelta-0.7.9-r2.ebuild | 2 | ||||
| -rw-r--r-- | app-portage/pqlop/pqlop-0.02-r1.ebuild | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/app-portage/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild index 852d7901a8f7..91e025ff6079 100644 --- a/app-portage/demerge/demerge-0.047-r3.ebuild +++ b/app-portage/demerge/demerge-0.047-r3.ebuild @@ -26,7 +26,7 @@ src_prepare() { } src_install() { - dobin demerge || die + dobin demerge dodoc Changelog doman demerge.3 } diff --git a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild index 88b2d88d7950..dbf8ea63a922 100644 --- a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild +++ b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild @@ -39,13 +39,13 @@ python_prepare_all() { python_compile_all() { if use doc; then - emake -C docs html || die 'failed to compile the documentation.' + emake -C docs html fi } python_install_all() { local HTML_DOCS=( ${PN}.html ) - doman ${PN}.1 || die 'doman failed.' + doman ${PN}.1 if use doc; then mv docs/_build/{html,sphinx} || die 'mv failed.' HTML_DOCS+=( docs/_build/sphinx ) diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild index ec2523cc02ca..4a68ff1273be 100644 --- a/app-portage/genlop/genlop-0.30.9-r1.ebuild +++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild @@ -23,7 +23,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-display.patch ) src_install() { - dobin genlop || die "failed to install genlop (via dobin)" + dobin genlop dodoc README Changelog doman genlop.1 newbashcomp genlop.bash-completion genlop diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild index df2523078442..cff0c6a6fe5e 100644 --- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild +++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild @@ -30,7 +30,7 @@ src_install () { sed -i -e "s:source /etc/make.conf:source /etc/make.conf || source /etc/portage/make.conf:" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.conf path" sed -i -e "s:/bin/sh:/bin/bash:" "${WORKDIR}"/getdelta.sh || die - dobin "${WORKDIR}"/getdelta.sh || die + dobin "${WORKDIR}"/getdelta.sh } pkg_postinst() { diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild index 0985141d34c4..72d9da4d8017 100644 --- a/app-portage/pqlop/pqlop-0.02-r1.ebuild +++ b/app-portage/pqlop/pqlop-0.02-r1.ebuild @@ -29,6 +29,6 @@ src_unpack() { } src_install() { - newbin "${DISTDIR}"/${P}.py ${PN} || die "newbin failed" + newbin "${DISTDIR}"/${P}.py ${PN} python_replicate_script "${ED}"/usr/bin/${PN} || die "python_replicate_script failed" } |