From 433d601b84e34987d14a0f52cbb7a60a6ed6b736 Mon Sep 17 00:00:00 2001 From: Ulrich Mueller Date: Wed, 26 Jan 2011 18:48:57 +0100 Subject: [PATCH] Revert "Bug #262365 - Punt the prepalldocs check until there is an alternative" This reverts commit 9da1ab2d6d894d784f9020688302743ce641fa30. Conflicts: pym/repoman/checks.py pym/repoman/errors.py --- bin/repoman | 2 ++ pym/repoman/checks.py | 11 ++++++++++- pym/repoman/errors.py | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/bin/repoman b/bin/repoman index 60c69fb..955935b 100755 --- a/bin/repoman +++ b/bin/repoman @@ -363,6 +363,7 @@ qahelp={ "metadata.missing":"Missing metadata.xml files", "metadata.bad":"Bad metadata.xml files", "metadata.warning":"Warnings in metadata.xml files", + "portage.internal":"The ebuild uses an internal Portage function", "virtual.versioned":"PROVIDE contains virtuals with versions", "virtual.exists":"PROVIDE contains existing package names", "virtual.unavailable":"PROVIDE contains a virtual which contains no profile default", @@ -409,6 +410,7 @@ qawarnings = set(( "java.eclassesnotused", "wxwidgets.eclassnotused", "metadata.warning", +"portage.internal", "virtual.versioned", "virtual.exists", "virtual.unavailable", diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py index baa7a38..ddf6338 100644 --- a/pym/repoman/checks.py +++ b/pym/repoman/checks.py @@ -536,6 +536,15 @@ class WantAutoDefaultValue(LineCheck): return 'WANT_AUTO' + m.group(1) + \ ' redundantly set to default value "latest" on line: %d' +class PortageInternal(LineCheck): + """ + In February 2009 the Gentoo council ruled that + prepalldocs is a Portage internal. + """ + repoman_check_name = 'portage.internal' + re = re.compile(r'[^#]*\bprepalldocs\b') + error = errors.PREPALLDOCS_ERROR + class SrcCompileEconf(PhaseCheck): repoman_check_name = 'ebuild.minorsyn' configure_re = re.compile(r'\s(econf|./configure)') @@ -622,7 +631,7 @@ _constant_checks = tuple((c() for c in ( ImplicitRuntimeDeps, InheritAutotools, InheritDeprecated, IUseUndefined, EMakeParallelDisabled, EMakeParallelDisabledViaMAKEOPTS, NoAsNeeded, DeprecatedBindnowFlags, SrcUnpackPatches, WantAutoDefaultValue, - SrcCompileEconf, Eapi3DeprecatedFuncs, + PortageInternal, SrcCompileEconf, Eapi3DeprecatedFuncs, Eapi4IncompatibleFuncs, Eapi4GoneVars, BuiltWithUse, PreserveOldLib, SandboxAddpredict))) diff --git a/pym/repoman/errors.py b/pym/repoman/errors.py index 5ad6be3..fee038e 100644 --- a/pym/repoman/errors.py +++ b/pym/repoman/errors.py @@ -15,6 +15,7 @@ REDUNDANT_CD_S_ERROR = 'Ebuild has redundant cd ${S} statement on line: %d' EMAKE_PARALLEL_DISABLED = 'Upstream parallel compilation bug (ebuild calls emake -j1 on line: %d)' EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS = 'Upstream parallel compilation bug (MAKEOPTS=-j1 on line: %d)' DEPRECATED_BINDNOW_FLAGS = 'Deprecated bindnow-flags call on line: %d' +PREPALLDOCS_ERROR = 'prepalldocs called on line: %d' EAPI_DEFINED_AFTER_INHERIT = 'EAPI defined after inherit on line: %d' NO_AS_NEEDED = 'Upstream asneeded linking bug (no-as-needed on line: %d)' PRESERVE_OLD_LIB = 'Upstream ABI change workaround on line: %d' -- 1.7.4.rc3