InheritEclass: support inherit after && or ||
authorZac Medico <zmedico@gentoo.org>
Fri, 1 Jun 2012 02:23:30 +0000 (19:23 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 1 Jun 2012 02:23:30 +0000 (19:23 -0700)
pym/repoman/checks.py

index 6573b95a63a1d7a0d5a567e15a6c40cba33b3ca9..21014353ea94568e30eb31926c5f565c9c28fc61 100644 (file)
@@ -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):