diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-31 19:23:30 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-31 19:23:30 -0700 |
| commit | 42297ec38d291165527ea4d5124638ce084cb15c (patch) | |
| tree | 7a5d07767d8f1a88fd71176f319d91c7c6962def /pym/repoman | |
| parent | a54ee82de8bb657017f6bc6407676930396f160f (diff) | |
| download | portage-42297ec38d291165527ea4d5124638ce084cb15c.tar.gz portage-42297ec38d291165527ea4d5124638ce084cb15c.tar.bz2 portage-42297ec38d291165527ea4d5124638ce084cb15c.zip | |
InheritEclass: support inherit after && or ||
Diffstat (limited to 'pym/repoman')
| -rw-r--r-- | 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 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): |