1 |
Complain only about deprecated eclasses that are inherited directly. |
2 |
Checking indirectly inherited eclasses is pointless since the ebuild |
3 |
maintainer can't really do anything about it --- it is up to |
4 |
the maintainer of one of the directly inherited eclasses. |
5 |
--- |
6 |
pym/repoman/checks.py | 16 ---------------- |
7 |
1 file changed, 16 deletions(-) |
8 |
|
9 |
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py |
10 |
index abb9545..5f37648 100644 |
11 |
--- a/pym/repoman/checks.py |
12 |
+++ b/pym/repoman/checks.py |
13 |
@@ -395,11 +395,8 @@ class InheritDeprecated(LineCheck): |
14 |
|
15 |
def new(self, pkg): |
16 |
self._errors = [] |
17 |
- self._indirect_deprecated = set(eclass for eclass in \ |
18 |
- self.deprecated_classes if eclass in pkg.inherited) |
19 |
|
20 |
def check(self, num, line): |
21 |
- |
22 |
direct_inherits = None |
23 |
m = self._inherit_re.match(line) |
24 |
if m is not None: |
25 |
@@ -415,11 +412,9 @@ class InheritDeprecated(LineCheck): |
26 |
if replacement is None: |
27 |
pass |
28 |
elif replacement is False: |
29 |
- self._indirect_deprecated.discard(eclass) |
30 |
self._errors.append("please migrate from " + \ |
31 |
"'%s' (no replacement) on line: %d" % (eclass, num + 1)) |
32 |
else: |
33 |
- self._indirect_deprecated.discard(eclass) |
34 |
self._errors.append("please migrate from " + \ |
35 |
"'%s' to '%s' on line: %d" % \ |
36 |
(eclass, replacement, num + 1)) |
37 |
@@ -429,17 +424,6 @@ class InheritDeprecated(LineCheck): |
38 |
yield error |
39 |
del self._errors |
40 |
|
41 |
- for eclass in self._indirect_deprecated: |
42 |
- replacement = self.deprecated_classes[eclass] |
43 |
- if replacement is False: |
44 |
- yield "please migrate from indirect " + \ |
45 |
- "inherit of '%s' (no replacement)" % (eclass,) |
46 |
- else: |
47 |
- yield "please migrate from indirect " + \ |
48 |
- "inherit of '%s' to '%s'" % \ |
49 |
- (eclass, replacement) |
50 |
- del self._indirect_deprecated |
51 |
- |
52 |
class InheritEclass(LineCheck): |
53 |
""" |
54 |
Base class for checking for missing inherits, as well as excess inherits. |
55 |
-- |
56 |
2.1.0 |