Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
Date: Wed, 28 Feb 2018 22:21:23
Message-Id: 1519856456.0b22104cee07531d5788fd97139dfa30a469a684.asturm@gentoo
1 commit: 0b22104cee07531d5788fd97139dfa30a469a684
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 28 21:35:36 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 28 22:20:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b22104c
7
8 net-firewall/firewalld: Add missing || die
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15 diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
16 index d0345b01e7c..63f66354740 100644
17 --- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
18 +++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
19 @@ -72,16 +72,16 @@ src_install() {
20 python_replicate_script "${D}/usr/sbin/firewalld"
21
22 # Get rid of junk
23 - rm -rf "${D}/etc/rc.d/"
24 - rm -rf "${D}/etc/sysconfig/"
25 + rm -rf "${D}/etc/rc.d/" || die
26 + rm -rf "${D}/etc/sysconfig/" || die
27
28 # For non-gui installs we need to remove GUI bits
29 if ! use gui; then
30 - rm -rf "${D}/etc/xdg/autostart"
31 - rm -f "${D}/usr/bin/firewall-applet"
32 - rm -f "${D}/usr/bin/firewall-config"
33 - rm -rf "${D}/usr/share/applications"
34 - rm -rf "${D}/usr/share/icons"
35 + rm -rf "${D}/etc/xdg/autostart" || die
36 + rm -f "${D}/usr/bin/firewall-applet" || die
37 + rm -f "${D}/usr/bin/firewall-config" || die
38 + rm -rf "${D}/usr/share/applications" || die
39 + rm -rf "${D}/usr/share/icons" || die
40 fi
41
42 newinitd "${FILESDIR}"/firewalld.init firewalld