| 1 |
commit: 42297ec38d291165527ea4d5124638ce084cb15c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 1 02:23:30 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 1 02:23:30 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=42297ec3 |
| 7 |
|
| 8 |
InheritEclass: support inherit after && or || |
| 9 |
|
| 10 |
--- |
| 11 |
pym/repoman/checks.py | 2 +- |
| 12 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py |
| 15 |
index 6573b95..2101435 100644 |
| 16 |
--- a/pym/repoman/checks.py |
| 17 |
+++ b/pym/repoman/checks.py |
| 18 |
@@ -469,7 +469,7 @@ class InheritEclass(LineCheck): |
| 19 |
subclasses = _eclass_subclass_info.get(eclass) |
| 20 |
if subclasses is not None: |
| 21 |
inherit_re = '(%s)' % '|'.join([eclass] + list(subclasses)) |
| 22 |
- self._inherit_re = re.compile(r'^\s*inherit\s(.*\s)?%s(\s|$)' % inherit_re) |
| 23 |
+ self._inherit_re = re.compile(r'^(\s*|.*[|&]\s*)\binherit\s(.*\s)?%s(\s|$)' % inherit_re) |
| 24 |
self._func_re = re.compile(r'\b(' + '|'.join(funcs) + r')\b') |
| 25 |
|
| 26 |
def new(self, pkg): |
Archives