From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 1 Nov 2007 18:26:41 +0000 (-0000)
Subject: Properly escape { and } characters in regular expressions even
X-Git-Tag: v2.2_pre1~470
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9eee27795cb42098f6036ee6f2183cf1a88e9343;p=portage.git

Properly escape { and } characters in regular expressions even
though it seems to work either way.

svn path=/main/trunk/; revision=8355
---

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index 66918cbd8..b6c430569 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -120,10 +120,10 @@ class EbuildQuote(ContentCheck):
 	repoman_check_name = 'ebuild.minorsyn'
 	ignore_line = re.compile(r'(^$)|(^\s*#.*)|(^\s*\w+=.*)|(^\s*(local|export)\s+)')
 	var_names = r'(D|S|T|ROOT|FILESDIR|WORKDIR)'
-	var_reference = re.compile(r'\$({'+var_names+'}|' + \
+	var_reference = re.compile(r'\$(\{'+var_names+'\}|' + \
 		var_names + '\W)')
-	missing_quotes = re.compile(r'(\s|^)[^"\s]*\${?' + var_names + \
-		r'}?[^"\s]*(\s|$)')
+	missing_quotes = re.compile(r'(\s|^)[^"\s]*\$\{?' + var_names + \
+		r'\}?[^"\s]*(\s|$)')
 	cond_begin =  re.compile(r'(^|\s+)\[\[($|\\$|\s+)')
 	cond_end =  re.compile(r'(^|\s+)\]\]($|\\$|\s+)')