From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qoa70-0003bK-AG for garchives@archives.gentoo.org; Wed, 03 Aug 2011 11:59:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50FD721C209; Wed, 3 Aug 2011 11:58:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 22C9621C208 for ; Wed, 3 Aug 2011 11:58:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 860631B403B for ; Wed, 3 Aug 2011 11:58:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 995AE80051 for ; Wed, 3 Aug 2011 11:58:57 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <3c5f2f67bbb75895798b3efb0fd7811d2447bf15.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-dev:master commit in: eclass/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: eclass/selinux-policy-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 3c5f2f67bbb75895798b3efb0fd7811d2447bf15 Date: Wed, 3 Aug 2011 11:58:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 34891284d3c706478501b0636820febb commit: 3c5f2f67bbb75895798b3efb0fd7811d2447bf15 Author: Sven Vermeulen siphos be> AuthorDate: Wed Aug 3 11:23:23 2011 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Wed Aug 3 11:23:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3D3c5f2f67 Add die statements where appropriate. Thanks to Peter Volkov (pva g.= o) --- eclass/selinux-policy-2.eclass | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.ecl= ass index 83ac176..423553a 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.eclass @@ -136,10 +136,12 @@ selinux-policy-2_src_prepare() { done =20 for i in ${POLICY_TYPES}; do - mkdir "${S}"/${i} - cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile + mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}" + cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \ + || die "Failed to copy Makefile.example to ${S}/${i}/Makefile" =20 - cp ${modfiles} "${S}"/${i} + cp ${modfiles} "${S}"/${i} \ + || die "Failed to copy the module files to ${S}/${i}" done } =20 @@ -183,7 +185,7 @@ selinux-policy-2_pkg_postinst() { for i in ${POLICY_TYPES}; do einfo "Inserting the following modules into the $i module store: ${MOD= S}" =20 - cd /usr/share/selinux/${i} + cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/= ${i}" semodule -s ${i} ${COMMAND} || die "Failed to load in modules ${MODS} = in the $i policy store" done }