From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 28 Feb 2011 20:37:22 +0000 (-0800)
Subject: repoman: variable.usedwithhelpers ignore quoted
X-Git-Tag: v2.1.9.42~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33b6ee0f8e60d4940f270a06de48bd5bbee45a0d;p=portage.git

repoman: variable.usedwithhelpers ignore quoted
---

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index 566984a51..200b542bb 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -333,7 +333,9 @@ class NoOffsetWithHelpers(LineCheck):
 	helpers """
 
 	repoman_check_name = 'variable.usedwithhelpers'
-	re = re.compile(r'^[^#]*\b(dodir|dohard|exeinto|insinto|into)\s+"?\$\{?(D|ROOT|ED|EROOT|EPREFIX)\b.*')
+	# Ignore matches in quoted strings like this:
+	# elog "installed into ${ROOT}usr/share/php5/apc/."
+	re = re.compile(r'^[^#"\']*\b(dodir|dohard|exeinto|insinto|into)\s+"?\$\{?(D|ROOT|ED|EROOT|EPREFIX)\b.*')
 	error = errors.NO_OFFSET_WITH_HELPERS
 
 class ImplicitRuntimeDeps(LineCheck):