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-power | |
| 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-power')
| -rw-r--r-- | sys-power/apcupsd/apcupsd-3.14.13.ebuild | 2 | ||||
| -rw-r--r-- | sys-power/nut/nut-2.7.4-r1.ebuild | 16 | ||||
| -rw-r--r-- | sys-power/pmtools/pmtools-20110323-r1.ebuild | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild index cbebbb1a5c2d..a888ac246e8b 100644 --- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild +++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild @@ -74,7 +74,7 @@ src_compile() { # the text files in the distribution, but I wouldn't count on them # doing that anytime soon. MANPAGER=$(type -p cat) \ - emake || die "emake failed" + emake } src_install() { diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild index 33146bc92d79..48deb79389f8 100644 --- a/sys-power/nut/nut-2.7.4-r1.ebuild +++ b/sys-power/nut/nut-2.7.4-r1.ebuild @@ -155,7 +155,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install find "${D}" -name '*.la' -exec rm -f {} + @@ -174,19 +174,19 @@ src_install() { mv "${i}" "${i/.sample/}" done - dodoc AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING || die + dodoc AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING newdoc lib/README README.lib || die newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die docinto cables - dodoc docs/cables/* || die + dodoc docs/cables/* - newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd || die - newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv || die - newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon || die - newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog || die - newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail || die + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd + newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog + newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail keepdir /var/lib/nut diff --git a/sys-power/pmtools/pmtools-20110323-r1.ebuild b/sys-power/pmtools/pmtools-20110323-r1.ebuild index 705fa4ffcf16..2b6a541659eb 100644 --- a/sys-power/pmtools/pmtools-20110323-r1.ebuild +++ b/sys-power/pmtools/pmtools-20110323-r1.ebuild @@ -34,7 +34,7 @@ src_prepare() { src_compile() { # respect user's LDFLAGS - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die "emake failed" + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" } src_install() { |