From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:30:22 +0000 (-0000)
Subject: Make EbuildWhitespace ignore here-documents. Thanks to Diego Pettenò
X-Git-Tag: v2.1.6.12~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6b14780e2f0c88b06b2ec4663b739c8291d7255;p=portage.git

Make EbuildWhitespace ignore here-documents. Thanks to Diego Pettenò
<flameeyes@g.o> for reporting. (trunk r13411)

svn path=/main/branches/2.1.6/; revision=13551
---

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index f1dce8b89..075370b6b 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -71,13 +71,28 @@ class EbuildWhitespace(LineCheck):
 	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..."""