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 <gentoo-commits+bounces-348992-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QRXNj-0005HS-38
for garchives@archives.gentoo.org; Tue, 31 May 2011 22:25:47 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 61FF71C03F;
Tue, 31 May 2011 22:25:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 2B1DB1C03F
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2011 22:25:39 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 861F31B4011
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2011 22:25:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id A0C6580508
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2011 22:25:37 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <10f6c6d3c028a509ed943ef76633c72dbbcff7f6.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/repoman/checks.py
X-VCS-Directories: pym/repoman/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 10f6c6d3c028a509ed943ef76633c72dbbcff7f6
Date: Tue, 31 May 2011 22:25:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: d20d5fbe79e1c8ee1cb073b620c0c851
commit: 10f6c6d3c028a509ed943ef76633c72dbbcff7f6
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 22:22:02 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue May 31 22:22:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D10f6c6d3
repoman: disallow EMERGE_FROM in EAPI 4
We already have the Eapi4GoneVars check for AA and KV which were
removed in EAPI 4, so we can re-use it to disallow EMERGE_FROM.
This will fix bug #368865.
---
pym/repoman/checks.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index bc25cd5..c9ada5f 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -619,10 +619,11 @@ class Eapi4IncompatibleFuncs(LineCheck):
class Eapi4GoneVars(LineCheck):
repoman_check_name =3D 'EAPI.incompatible'
ignore_line =3D re.compile(r'(^\s*#)')
- undefined_vars_re =3D re.compile(r'.*\$(\{(AA|KV)\}|(AA|KV))')
+ undefined_vars_re =3D re.compile(r'.*\$(\{(AA|KV|EMERGE_FROM)\}|(AA|KV|=
EMERGE_FROM))')
=20
def check_eapi(self, eapi):
- return not eapi_exports_AA(eapi) or not eapi_exports_KV(eapi)
+ # AA, KV, and EMERGE_FROM should not be referenced in EAPI 4 or later.
+ return not eapi_exports_AA(eapi)
=20
def check(self, num, line):
m =3D self.undefined_vars_re.match(line)