[gentoo-commits] portage r13552 - main/branches/2.1.6/pym/repoman

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-04-30 07:30:32 +0000 (Thu, 30 Apr 2009)
New Revision: 13552

Modified:
   main/branches/2.1.6/pym/repoman/checks.py
Log:
Move the here-document code from the EbuildWhitespace check to the
run_checks() function, so that all checks ignore the content of
here-documents. (trunk r13412)

Modified: main/branches/2.1.6/pym/repoman/checks.py
===================================================================
--- main/branches/2.1.6/pym/repoman/checks.py	2009-04-30 07:30:22 UTC (rev 13551)
+++ main/branches/2.1.6/pym/repoman/checks.py	2009-04-30 07:30:32 UTC (rev 13552)
@@ -71,29 +71,13 @@
 	ignore_line = re.compile(r'(^$)|(^(\t)*#)')
 	leading_spaces = re.compile(r'^[\S\t]')
 	trailing_whitespace = re.compile(r'.*([\S]$)')	
-	here_doc_re = re.compile(r'.*\s<<[-]?(\w+)$')
 
-	def new(self, pkg):
-		self._here_doc_delim = None
-
 	def check(self, num, line):
+		if self.leading_spaces.match(line) is None:
+			return errors.LEADING_SPACES_ERROR
+		if self.trailing_whitespace.match(line) is None:
+			return errors.TRAILING_WHITESPACE_ERROR
 
-		# Check if we're inside a here-document.
-		if self._here_doc_delim is not None:
-			if self._here_doc_delim.match(line):
-				self._here_doc_delim = None
-		if self._here_doc_delim is None:
-			here_doc = self.here_doc_re.match(line)
-			if here_doc is not None:
-				self._here_doc_delim = re.compile('^%s$' % here_doc.group(1))
-
-		if self._here_doc_delim is None:
-			# We're not in a here-document.
-			if self.leading_spaces.match(line) is None:
-				return errors.LEADING_SPACES_ERROR
-			if self.trailing_whitespace.match(line) is None:
-				return errors.TRAILING_WHITESPACE_ERROR
-
 class EbuildQuote(LineCheck):
 	"""Ensure ebuilds have valid quoting around things like D,FILESDIR, etc..."""
 
@@ -386,18 +370,34 @@
 	EMakeParallelDisabled, EMakeParallelDisabledViaMAKEOPTS,
 	DeprecatedBindnowFlags, WantAutoDefaultValue)))
 
+_here_doc_re = re.compile(r'.*\s<<[-]?(\w+)$')
+
 def run_checks(contents, pkg):
 	checks = _constant_checks
+	here_doc_delim = None
 
 	for lc in checks:
 		lc.new(pkg)
 	for num, line in enumerate(contents):
-		for lc in checks:
-			ignore = lc.ignore_line
-			if not ignore or not ignore.match(line):
-				e = lc.check(num, line)
-				if e:
-					yield lc.repoman_check_name, e % (num + 1)
+
+		# Check if we're inside a here-document.
+		if here_doc_delim is not None:
+			if here_doc_delim.match(line):
+				here_doc_delim = None
+		if here_doc_delim is None:
+			here_doc = _here_doc_re.match(line)
+			if here_doc is not None:
+				here_doc_delim = re.compile('^%s$' % here_doc.group(1))
+
+		if here_doc_delim is None:
+			# We're not in a here-document.
+			for lc in checks:
+				ignore = lc.ignore_line
+				if not ignore or not ignore.match(line):
+					e = lc.check(num, line)
+					if e:
+						yield lc.repoman_check_name, e % (num + 1)
+
 	for lc in checks:
 		i = lc.end()
 		if i is not None: