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 1Qoa6u-0003Zf-H5 for garchives@archives.gentoo.org; Wed, 03 Aug 2011 11:59:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B8B121C1FD; Wed, 3 Aug 2011 11:58:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6CC4C21C1FD for ; Wed, 3 Aug 2011 11:58:58 +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 8BA0F1B4006 for ; Wed, 3 Aug 2011 11:58:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C89EA80042 for ; Wed, 3 Aug 2011 11:58:56 +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: <0223c058850ff90c8d6495f3408c0e0445198d9e.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: 0223c058850ff90c8d6495f3408c0e0445198d9e Date: Wed, 3 Aug 2011 11:58:56 +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: 7024772856eecb78e12a7e475c5e04e5 commit: 0223c058850ff90c8d6495f3408c0e0445198d9e Author: Sven Vermeulen siphos be> AuthorDate: Wed Aug 3 11:12:43 2011 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Wed Aug 3 11:12:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3D0223c058 EAPI is a string, not a number. Use has function. Thanks to Peter Volkov = (pva g.o) --- eclass/selinux-policy-2.eclass | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.ecl= ass index 6ae1046..61a67b5 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.eclass @@ -93,11 +93,8 @@ EXPORT_FUNCTIONS ${SELINUX_EXPF} selinux-policy-2_src_unpack() { unpack ${A} =20 - if [[ ${EAPI:-0} -le 1 ]]; - then - # Call src_prepare explicitly for EAPI 0 or 1 - selinux-policy-2_src_prepare - fi + # Call src_prepare explicitly for EAPI 0 or 1 + has "${EAPI:-0}" 0 1 && selinux-policy-2_src_prepare } =20 # @FUNCTION: selinux-policy-2_src_prepare