summaryrefslogtreecommitdiffstats
path: root/pym/repoman
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2012-11-22 23:11:35 +0100
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2012-11-22 23:11:35 +0100
commit71859a7defe5700b1bf8442657913a2be1dafdfb (patch)
tree8e67a9d03adb5a858d829695fb011efc172ed47c /pym/repoman
parente9dc56625152991ba535f5be3ab88fc7ec8dbcfc (diff)
downloadportage-71859a7defe5700b1bf8442657913a2be1dafdfb.tar.gz
portage-71859a7defe5700b1bf8442657913a2be1dafdfb.tar.bz2
portage-71859a7defe5700b1bf8442657913a2be1dafdfb.zip
Fix some typos and improve amount of whitespace.
Diffstat (limited to 'pym/repoman')
-rw-r--r--pym/repoman/checks.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index 0cae50dde..f8252b5af 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -69,7 +69,7 @@ class EbuildHeader(LineCheck):
Copyright header errors
CVS header errors
License header errors
-
+
Args:
modification_year - Year the ebuild was last modified
"""
@@ -112,7 +112,7 @@ class EbuildWhitespace(LineCheck):
ignore_line = re.compile(r'(^$)|(^(\t)*#)')
ignore_comment = False
leading_spaces = re.compile(r'^[\S\t]')
- trailing_whitespace = re.compile(r'.*([\S]$)')
+ trailing_whitespace = re.compile(r'.*([\S]$)')
def check(self, num, line):
if self.leading_spaces.match(line) is None:
@@ -169,7 +169,7 @@ class EbuildQuote(LineCheck):
r'\}?[^"\'\s]*(\s|$)')
cond_begin = re.compile(r'(^|\s+)\[\[($|\\$|\s+)')
cond_end = re.compile(r'(^|\s+)\]\]($|\\$|\s+)')
-
+
def check(self, num, line):
if self.var_reference.search(line) is None:
return
@@ -239,11 +239,11 @@ class Eapi3EbuildAssignment(EbuildAssignment):
return eapi_supports_prefix(eapi)
class EbuildNestedDie(LineCheck):
- """Check ebuild for nested die statements (die statements in subshells"""
-
+ """Check ebuild for nested die statements (die statements in subshells)"""
+
repoman_check_name = 'ebuild.nesteddie'
nesteddie_re = re.compile(r'^[^#]*\s\(\s[^)]*\bdie\b')
-
+
def check(self, num, line):
if self.nesteddie_re.match(line):
return errors.NESTED_DIE_ERROR
@@ -465,13 +465,13 @@ class InheritEclass(LineCheck):
self._inherit_re = re.compile(r'^(\s*|.*[|&]\s*)\binherit\s(.*\s)?%s(\s|$)' % inherit_re)
# Match when the function is preceded only by leading whitespace, a
# shell operator such as (, {, |, ||, or &&, or optional variable
- # setting(s). This prevents false postives in things like elog
+ # setting(s). This prevents false positives in things like elog
# messages, as reported in bug #413285.
self._func_re = re.compile(r'(^|[|&{(])\s*(\w+=.*)?\b(' + '|'.join(funcs) + r')\b')
def new(self, pkg):
self.repoman_check_name = 'inherit.missing'
- # We can't use pkg.inherited because that tells us all the eclass that
+ # We can't use pkg.inherited because that tells us all the eclasses that
# have been inherited and not just the ones we inherit directly.
self._inherit = False
self._func_call = False
@@ -777,7 +777,7 @@ class PortageInternal(LineCheck):
repoman_check_name = 'portage.internal'
ignore_comment = True
# Match when the command is preceded only by leading whitespace or a shell
- # operator such as (, {, |, ||, or &&. This prevents false postives in
+ # operator such as (, {, |, ||, or &&. This prevents false positives in
# things like elog messages, as reported in bug #413285.
re = re.compile(r'^(\s*|.*[|&{(]+\s*)\b(ecompress|ecompressdir|env-update|prepall|prepalldocs|preplib)\b')
@@ -788,7 +788,6 @@ class PortageInternal(LineCheck):
return ("'%s'" % m.group(2)) + " called on line: %d"
class PortageInternalVariableAssignment(LineCheck):
-
repoman_check_name = 'portage.internal'
internal_assignment = re.compile(r'\s*(export\s+)?(EXTRA_ECONF|EXTRA_EMAKE)\+?=')
@@ -799,6 +798,7 @@ class PortageInternalVariableAssignment(LineCheck):
e = 'Assignment to variable %s' % match.group(2)
e += ' on line: %d'
return e
+
_base_check_classes = (InheritEclass, LineCheck, PhaseCheck)
_constant_checks = tuple(chain((v() for k, v in globals().items()
if isinstance(v, type) and issubclass(v, LineCheck) and v not in _base_check_classes),