| 1 |
commit: f160c636e6b6fd4388534a2483e33b4a241bd1fe |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 2 06:24:10 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 2 06:24:10 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f160c636 |
| 7 |
|
| 8 |
InheritEclass: remove unused inherited_api code |
| 9 |
|
| 10 |
--- |
| 11 |
pym/repoman/checks.py | 14 -------------- |
| 12 |
1 files changed, 0 insertions(+), 14 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py |
| 15 |
index 62c735e..15c5f35 100644 |
| 16 |
--- a/pym/repoman/checks.py |
| 17 |
+++ b/pym/repoman/checks.py |
| 18 |
@@ -468,9 +468,6 @@ class InheritEclass(LineCheck): |
| 19 |
self._exempt_eclasses = exempt_eclasses |
| 20 |
self._ignore_missing = ignore_missing |
| 21 |
inherit_re = eclass |
| 22 |
- subclasses = _eclass_subclass_info.get(eclass) |
| 23 |
- if subclasses is not None: |
| 24 |
- inherit_re = '(%s)' % '|'.join([eclass] + list(subclasses)) |
| 25 |
self._inherit_re = re.compile(r'^(\s*|.*[|&]\s*)\binherit\s(.*\s)?%s(\s|$)' % inherit_re) |
| 26 |
self._func_re = re.compile(r'\b(' + '|'.join(funcs) + r')\b') |
| 27 |
|
| 28 |
@@ -564,8 +561,6 @@ _eclass_info = { |
| 29 |
|
| 30 |
# These are "eclasses are the whole ebuild" type thing. |
| 31 |
'exempt_eclasses': _eclass_export_functions, |
| 32 |
- |
| 33 |
- #'inherited_api': ('multilib', 'user',), |
| 34 |
}, |
| 35 |
|
| 36 |
'flag-o-matic': { |
| 37 |
@@ -617,14 +612,6 @@ _eclass_info = { |
| 38 |
} |
| 39 |
} |
| 40 |
|
| 41 |
-_eclass_subclass_info = {} |
| 42 |
- |
| 43 |
-for k, v in _eclass_info.items(): |
| 44 |
- inherited_api = v.get('inherited_api') |
| 45 |
- if inherited_api is not None: |
| 46 |
- for parent in inherited_api: |
| 47 |
- _eclass_subclass_info.setdefault(parent, set()).add(k) |
| 48 |
- |
| 49 |
if not _ENABLE_INHERIT_CHECK: |
| 50 |
# Since the InheritEclass check is experimental, in the stable branch |
| 51 |
# we emulate the old eprefixify.defined and inherit.autotools checks. |
| 52 |
@@ -647,7 +634,6 @@ if not _ENABLE_INHERIT_CHECK: |
| 53 |
'comprehensive': False |
| 54 |
} |
| 55 |
} |
| 56 |
- _eclass_subclass_info = {} |
| 57 |
|
| 58 |
class IUseUndefined(LineCheck): |
| 59 |
""" |
Archives