From 42297ec38d291165527ea4d5124638ce084cb15c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 31 May 2012 19:23:30 -0700 Subject: InheritEclass: support inherit after && or || --- pym/repoman/checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pym/repoman/checks.py') 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): -- cgit v1.2.3-1-g7c22