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:40
Message-Id: 0223c058850ff90c8d6495f3408c0e0445198d9e.SwifT@gentoo
1 commit: 0223c058850ff90c8d6495f3408c0e0445198d9e
2 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
3 AuthorDate: Wed Aug 3 11:12:43 2011 +0000
4 Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
5 CommitDate: Wed Aug 3 11:12:43 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=0223c058
7
8 EAPI is a string, not a number. Use has function. Thanks to Peter Volkov (pva <AT> g.o)
9
10 ---
11 eclass/selinux-policy-2.eclass | 7 ++-----
12 1 files changed, 2 insertions(+), 5 deletions(-)
13
14 diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
15 index 6ae1046..61a67b5 100644
16 --- a/eclass/selinux-policy-2.eclass
17 +++ b/eclass/selinux-policy-2.eclass
18 @@ -93,11 +93,8 @@ EXPORT_FUNCTIONS ${SELINUX_EXPF}
19 selinux-policy-2_src_unpack() {
20 unpack ${A}
21
22 - if [[ ${EAPI:-0} -le 1 ]];
23 - then
24 - # Call src_prepare explicitly for EAPI 0 or 1
25 - selinux-policy-2_src_prepare
26 - fi
27 + # Call src_prepare explicitly for EAPI 0 or 1
28 + has "${EAPI:-0}" 0 1 && selinux-policy-2_src_prepare
29 }
30
31 # @FUNCTION: selinux-policy-2_src_prepare