From bb93af369a622d63cbfd7746f51e014ce4952215 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 29 Mar 2008 03:29:24 +0000 Subject: Add a new "ebuild.patches" check for the PATCHES variable that's used by base_src_unpack() from base.eclass. This generates a warning if the variable is not defined as an array, since this is required for white space safety. Thanks to Betelgeuse for the initial patch. svn path=/main/trunk/; revision=9587 --- pym/repoman/checks.py | 12 +++++++++--- pym/repoman/errors.py | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'pym') diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py index aa5bf1845..bc1c29115 100644 --- a/pym/repoman/checks.py +++ b/pym/repoman/checks.py @@ -18,8 +18,8 @@ class LineCheck(object): def check(self, num, line): """Run the check on line and return error if there is one""" - pass - + if self.re.match(line): + return self.error class EbuildHeader(LineCheck): """Ensure ebuilds have proper headers @@ -191,6 +191,11 @@ class EbuildUselessCdS(LineCheck): elif self.method_re.match(line): self.check_next_line = True +class EbuildPatches(LineCheck): + """Ensure ebuilds use bash arrays for PATCHES to ensure white space safety""" + repoman_check_name = 'ebuild.patches' + re = re.compile(r'^\s*PATCHES=[^\(]') + error = errors.PATCHES_ERROR class EbuildQuotedA(LineCheck): """Ensure ebuilds have no quoting around ${A}""" @@ -206,7 +211,8 @@ class EbuildQuotedA(LineCheck): _constant_checks = tuple((c() for c in ( EbuildWhitespace, EbuildQuote, EbuildAssignment, EbuildUselessDodoc, - EbuildUselessCdS, EbuildNestedDie, EbuildQuotedA))) + EbuildUselessCdS, EbuildNestedDie, + EbuildPatches, EbuildQuotedA))) def run_checks(contents, st_mtime): checks = list(_constant_checks) diff --git a/pym/repoman/errors.py b/pym/repoman/errors.py index d1aad1d8a..90fa83820 100644 --- a/pym/repoman/errors.py +++ b/pym/repoman/errors.py @@ -11,4 +11,5 @@ TRAILING_WHITESPACE_ERROR = 'Trailing whitespace error on line: %d' READONLY_ASSIGNMENT_ERROR = 'Ebuild contains assignment to read-only variable on line: %d' MISSING_QUOTES_ERROR = 'Unquoted Variable on line: %d' 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' -- cgit v1.2.3-1-g7c22