From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 1 Jun 2012 02:23:30 +0000 (-0700)
Subject: InheritEclass: support inherit after && or ||
X-Git-Tag: v2.2.0_alpha109~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=42297ec38d291165527ea4d5124638ce084cb15c;p=portage.git

InheritEclass: support inherit after && or ||
---

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index 6573b95a6..21014353e 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -469,7 +469,7 @@ class InheritEclass(LineCheck):
 		subclasses = _eclass_subclass_info.get(eclass)
 		if subclasses is not None:
 			inherit_re = '(%s)' % '|'.join([eclass] + list(subclasses))
-		self._inherit_re = re.compile(r'^\s*inherit\s(.*\s)?%s(\s|$)' % inherit_re)
+		self._inherit_re = re.compile(r'^(\s*|.*[|&]\s*)\binherit\s(.*\s)?%s(\s|$)' % inherit_re)
 		self._func_re = re.compile(r'\b(' + '|'.join(funcs) + r')\b')
 
 	def new(self, pkg):