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

[Zac Medico (zmedico)]

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

Modified:
   main/branches/2.1.6/pym/repoman/checks.py
Log:
Make EbuildWhitespace ignore here-documents. Thanks to Diego Petten?\195?\178
<flameeyes@g.o> for reporting. (trunk r13411)

Modified: main/branches/2.1.6/pym/repoman/checks.py
===================================================================
--- main/branches/2.1.6/pym/repoman/checks.py	2009-04-30 07:30:14 UTC (rev 13550)
+++ main/branches/2.1.6/pym/repoman/checks.py	2009-04-30 07:30:22 UTC (rev 13551)
@@ -71,14 +71,29 @@
 	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 not self.leading_spaces.match(line):
-			return errors.LEADING_SPACES_ERROR
-		if not self.trailing_whitespace.match(line):
-			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..."""