From 1ab7611fda98ad82dfd585adbe9a6b829aa64faa Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 06:23:11 +0000 Subject: [PATCH] Add a new upstream.workaround check for hardcoded MAKEOPTS=-j1 (previously only emake -j1 was recognized). Thanks to Maciej Mrozowski for this patch. (trunk r12718) svn path=/main/branches/2.1.6/; revision=12973 --- pym/repoman/checks.py | 10 ++++++++-- pym/repoman/errors.py | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py index aee6d7c97..5fc1c1a93 100644 --- a/pym/repoman/checks.py +++ b/pym/repoman/checks.py @@ -322,6 +322,12 @@ class EMakeParallelDisabled(LineCheck): re = re.compile(r'^\s*emake\s+-j\s*1\s') error = errors.EMAKE_PARALLEL_DISABLED +class EMakeParallelDisabledViaMAKEOPTS(LineCheck): + """Check for MAKEOPTS=-j1 that disables parallelization.""" + repoman_check_name = 'upstream.workaround' + re = re.compile(r'^\s*MAKEOPTS=(\'|")?.*-j\s*1\b') + error = errors.EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS + class DeprecatedBindnowFlags(LineCheck): """Check for calls to the deprecated bindnow-flags function.""" repoman_check_name = 'ebuild.minorsyn' @@ -354,8 +360,8 @@ _constant_checks = tuple((c() for c in ( EbuildUselessCdS, EbuildNestedDie, EbuildPatches, EbuildQuotedA, IUseUndefined, ImplicitRuntimeDeps, InheritAutotools, - EMakeParallelDisabled, DeprecatedBindnowFlags, - WantAutoDefaultValue, PortageInternal))) + EMakeParallelDisabled, EMakeParallelDisabledViaMAKEOPTS, + DeprecatedBindnowFlags, WantAutoDefaultValue, PortageInternal))) def run_checks(contents, pkg): checks = _constant_checks diff --git a/pym/repoman/errors.py b/pym/repoman/errors.py index 205913951..451e499ad 100644 --- a/pym/repoman/errors.py +++ b/pym/repoman/errors.py @@ -14,5 +14,6 @@ NESTED_DIE_ERROR = 'Ebuild calls die in a subshell on line: %d' PATCHES_ERROR = 'PATCHES is not a bash array on line: %d' 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' -- 2.26.2