diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-22 13:16:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-22 13:16:21 -0700 |
| commit | 4260b00663cded4996bdfecf08b068176e8e5d81 (patch) | |
| tree | e1301cce9a3a76f1b1e863f4fc46e1388d3d6994 | |
| parent | 93ceaa213a10df814de8e893f4312dc43e2047c4 (diff) | |
| download | portage-4260b00663cded4996bdfecf08b068176e8e5d81.tar.gz portage-4260b00663cded4996bdfecf08b068176e8e5d81.tar.bz2 portage-4260b00663cded4996bdfecf08b068176e8e5d81.zip | |
Fix broken logic in InheritDeprecated.
| -rw-r--r-- | pym/repoman/checks.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py index 732559958..7a6edd176 100644 --- a/pym/repoman/checks.py +++ b/pym/repoman/checks.py @@ -395,8 +395,10 @@ class InheritDeprecated(LineCheck): return for eclass in direct_inherits: - replacement = self.deprecated_classes[eclass] - if replacement is False: + replacement = self.deprecated_classes.get(eclass) + if replacement is None: + pass + elif replacement is False: self._indirect_deprecated.discard(eclass) self._errors.append("please migrate from " + \ "'%s' (no replacement) on line: %d" % (eclass, num + 1)) @@ -412,10 +414,8 @@ class InheritDeprecated(LineCheck): del self._errors for eclass in self._indirect_deprecated: - replacement = self.deprecated_classes.get(eclass) - if replacement is None: - pass - elif replacement is False: + replacement = self.deprecated_classes[eclass] + if replacement is False: yield "please migrate from indirect " + \ "inherit of '%s' (no replacement)" % (eclass,) else: |