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 1SaHWs-0001dj-56 for garchives@archives.gentoo.org; Fri, 01 Jun 2012 02:23:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A31AE00AB; Fri, 1 Jun 2012 02:23:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CCB4AE00AB for ; Fri, 1 Jun 2012 02:23:46 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 369BC1B4004 for ; Fri, 1 Jun 2012 02:23:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 026E8E5428 for ; Fri, 1 Jun 2012 02:23:44 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1338517410.42297ec38d291165527ea4d5124638ce084cb15c.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: 42297ec38d291165527ea4d5124638ce084cb15c X-VCS-Branch: master Date: Fri, 1 Jun 2012 02:23:44 +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: 91a5d9b9-ccda-4cf1-8f77-7f52fbe54b7f X-Archives-Hash: 9f7cf7b1fb7df32f21b40104d0b1f983 commit: 42297ec38d291165527ea4d5124638ce084cb15c Author: Zac Medico gentoo org> AuthorDate: Fri Jun 1 02:23:30 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jun 1 02:23:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D42297ec3 InheritEclass: support inherit after && or || --- pym/repoman/checks.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py index 6573b95..2101435 100644 --- a/pym/repoman/checks.py +++ b/pym/repoman/checks.py @@ -469,7 +469,7 @@ class InheritEclass(LineCheck): subclasses =3D _eclass_subclass_info.get(eclass) if subclasses is not None: inherit_re =3D '(%s)' % '|'.join([eclass] + list(subclasses)) - self._inherit_re =3D re.compile(r'^\s*inherit\s(.*\s)?%s(\s|$)' % inhe= rit_re) + self._inherit_re =3D re.compile(r'^(\s*|.*[|&]\s*)\binherit\s(.*\s)?%s= (\s|$)' % inherit_re) self._func_re =3D re.compile(r'\b(' + '|'.join(funcs) + r')\b') =20 def new(self, pkg):