From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Apr 2012 20:15:56 +0000 (-0700)
Subject: repoman: fix portage.internal false positives
X-Git-Tag: v2.2.0_alpha102~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8889947c45a9fa81ca006b333466372b64f0344;p=portage.git

repoman: fix portage.internal false positives
---

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index ab4ddd9ec..733bbc3c1 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -664,13 +664,17 @@ class Eapi4GoneVars(LineCheck):
 
 class PortageInternal(LineCheck):
 	repoman_check_name = 'portage.internal'
-	re = re.compile(r'[^#]*\b(ecompress|ecompressdir|env-update|prepall|prepalldocs|preplib)\b')
+	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
+	# things like elog messages, as reported in bug #413285.
+	re = re.compile(r'^(\s*|.*[|&{(]+\s*)\b(ecompress|ecompressdir|env-update|prepall|prepalldocs|preplib)\b')
 
 	def check(self, num, line):
 		"""Run the check on line and return error if there is one"""
 		m = self.re.match(line)
 		if m is not None:
-			return ("'%s'" % m.group(1)) + " called on line: %d"
+			return ("'%s'" % m.group(2)) + " called on line: %d"
 
 _constant_checks = tuple((c() for c in (
 	EbuildHeader, EbuildWhitespace, EbuildBlankLine, EbuildQuote,