summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-18 06:55:41 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-18 06:55:41 +0000
commit289d6c3d11f9cab096c6d4deaf063b3879fe690c (patch)
treec5ceb03b76c7c56442c4b8fe8c3f0c287650dced
parenta07b0084b4c86763bc4e733ec9cb42842dbb4538 (diff)
downloadportage-289d6c3d11f9cab096c6d4deaf063b3879fe690c.tar.gz
portage-289d6c3d11f9cab096c6d4deaf063b3879fe690c.tar.bz2
portage-289d6c3d11f9cab096c6d4deaf063b3879fe690c.zip
Add an exemption for x-modular in the "inherit.autotools" check. Thanks to
remi` for reporting. svn path=/main/trunk/; revision=10714
-rw-r--r--pym/repoman/checks.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index 0f339adbc..dbd3b5ccc 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -225,15 +225,16 @@ _autotools_funcs = (
_autotools_func_re = re.compile(r'(^|\s)(' + \
"|".join(_autotools_funcs) + ')(\s|$)')
+# eclasses that inherit autotools and call it's functions
+_autotools_eclasses = frozenset(["apache-2", "x-modular"])
+
def run_checks(contents, pkg):
checks = list(_constant_checks)
checks.append(EbuildHeader(pkg.mtime))
iuse_def = None
inherit_autotools = "autotools" in pkg.inherited
if inherit_autotools:
- if "apache-2" in pkg.inherited:
- # eautoreconf is called by apache-2_src_unpack(),
- # so the ebuild doesn't need to call it.
+ if _autotools_eclasses.intersection(pkg.inherited):
inherit_autotools = False
autotools_func_call = None
for num, line in enumerate(contents):