Gentoo Archives: gentoo-commits

From: Kristian Fiskerstrand <k_f@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
Date: Wed, 28 Sep 2016 21:17:37
Message-Id: 1475097445.82a2fab3856a3dd33079e76bfc6efc8815d046f0.k_f@gentoo
1 commit: 82a2fab3856a3dd33079e76bfc6efc8815d046f0
2 Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 28 21:17:02 2016 +0000
4 Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 28 21:17:25 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a2fab3
7
8 sys-power/apcupsd: Fixup missing || die
9
10 Package-Manager: portage-2.3.1
11
12 sys-power/apcupsd/apcupsd-3.14.14.ebuild | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15 diff --git a/sys-power/apcupsd/apcupsd-3.14.14.ebuild b/sys-power/apcupsd/apcupsd-3.14.14.ebuild
16 index 22b9887..02c1086 100644
17 --- a/sys-power/apcupsd/apcupsd-3.14.14.ebuild
18 +++ b/sys-power/apcupsd/apcupsd-3.14.14.ebuild
19 @@ -74,12 +74,12 @@ src_compile() {
20 # the text files in the distribution, but I wouldn't count on them
21 # doing that anytime soon.
22 MANPAGER=$(type -p cat) \
23 - emake || die "emake failed"
24 + emake
25 }
26
27 src_install() {
28 emake DESTDIR="${D}" install
29 - rm -f "${D}"/etc/init.d/halt
30 + rm -f "${D}"/etc/init.d/halt || die
31
32 insinto /etc/apcupsd
33 newins examples/safe.apccontrol safe.apccontrol
34 @@ -90,7 +90,7 @@ src_install() {
35
36 dohtml -r doc/manual/*
37
38 - rm "${D}"/etc/init.d/apcupsd
39 + rm "${D}"/etc/init.d/apcupsd || die
40 newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
41 newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
42
43 @@ -98,7 +98,7 @@ src_install() {
44 systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
45
46 # remove hal settings, we don't really want to have it around still.
47 - rm -r "${D}"/usr/share/hal
48 + rm -r "${D}"/usr/share/hal || die
49
50 # replace it with our udev rules if we're in Linux
51 if use kernel_linux; then