Gentoo Archives: gentoo-commits

From: Sven Vermeulen <sven.vermeulen@××××××.be>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-dev:master commit in: eclass/
Date: Wed, 03 Aug 2011 11:59:26
Message-Id: 56283a111f9abeeb4bceb9a7d3adf371cfa2a35a.SwifT@gentoo
1 commit: 56283a111f9abeeb4bceb9a7d3adf371cfa2a35a
2 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
3 AuthorDate: Wed Aug 3 11:14:45 2011 +0000
4 Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
5 CommitDate: Wed Aug 3 11:14:45 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=56283a11
7
8 Use bash tests. Do not use quotation when we are confident that the variable is declared properly and does not contain spaces or escaped characters. POLICY_PATCH requires quotation as it can contain spaces. Thanks to Peter Volkov (pva <AT> g.o)
9
10 ---
11 eclass/selinux-policy-2.eclass | 8 ++++----
12 1 files changed, 4 insertions(+), 4 deletions(-)
13
14 diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
15 index 61a67b5..9808fab 100644
16 --- a/eclass/selinux-policy-2.eclass
17 +++ b/eclass/selinux-policy-2.eclass
18 @@ -51,7 +51,7 @@ inherit eutils
19 IUSE=""
20
21 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
22 -if [[ -n "${BASEPOL}" ]];
23 +if [[ -n ${BASEPOL} ]];
24 then
25 SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2"
26 else
27 @@ -66,7 +66,7 @@ PATCHBUNDLE="${DISTDIR}/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
28
29 # Modules should always depend on at least the first release of the
30 # selinux-base-policy for which they are generated.
31 -if [[ -n "${BASEPOL}" ]];
32 +if [[ -n ${BASEPOL} ]];
33 then
34 RDEPEND=">=sys-apps/policycoreutils-2.0.82
35 >=sec-policy/selinux-base-policy-${PV}"
36 @@ -113,14 +113,14 @@ selinux-policy-2_src_prepare() {
37 local modfiles
38
39 # Patch the sources with the base patchbundle
40 - if [[ -n "${BASEPOL}" ]];
41 + if [[ -n ${BASEPOL} ]];
42 then
43 cd "${S}"
44 epatch "${PATCHBUNDLE}"
45 fi
46
47 # Apply the additional patches refered to by the module ebuild
48 - if [ -n "${POLICY_PATCH}" ];
49 + if [[ -n "${POLICY_PATCH}" ]];
50 then
51 for POLPATCH in "${POLICY_PATCH}";
52 do