From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A9C2E138332 for ; Wed, 28 Feb 2018 22:21:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B80E9E0884; Wed, 28 Feb 2018 22:21:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 967A8E0884 for ; Wed, 28 Feb 2018 22:21:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67F8B335C39 for ; Wed, 28 Feb 2018 22:21:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8B3121D for ; Wed, 28 Feb 2018 22:21:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1519856456.0b22104cee07531d5788fd97139dfa30a469a684.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/firewalld/firewalld-0.5.1-r2.ebuild X-VCS-Directories: net-firewall/firewalld/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0b22104cee07531d5788fd97139dfa30a469a684 X-VCS-Branch: master Date: Wed, 28 Feb 2018 22:21:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5b20a5ad-d103-447c-8557-717872a68e18 X-Archives-Hash: b102115365e5381860b237896c6882a4 commit: 0b22104cee07531d5788fd97139dfa30a469a684 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 28 21:35:36 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 28 22:20:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b22104c net-firewall/firewalld: Add missing || die Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild index d0345b01e7c..63f66354740 100644 --- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild +++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild @@ -72,16 +72,16 @@ src_install() { python_replicate_script "${D}/usr/sbin/firewalld" # Get rid of junk - rm -rf "${D}/etc/rc.d/" - rm -rf "${D}/etc/sysconfig/" + rm -rf "${D}/etc/rc.d/" || die + rm -rf "${D}/etc/sysconfig/" || die # For non-gui installs we need to remove GUI bits if ! use gui; then - rm -rf "${D}/etc/xdg/autostart" - rm -f "${D}/usr/bin/firewall-applet" - rm -f "${D}/usr/bin/firewall-config" - rm -rf "${D}/usr/share/applications" - rm -rf "${D}/usr/share/icons" + rm -rf "${D}/etc/xdg/autostart" || die + rm -f "${D}/usr/bin/firewall-applet" || die + rm -f "${D}/usr/bin/firewall-config" || die + rm -rf "${D}/usr/share/applications" || die + rm -rf "${D}/usr/share/icons" || die fi newinitd "${FILESDIR}"/firewalld.init firewalld