From 0ace25ca210cbd7d267644fd4e37c419b5c34afa Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Mon, 21 Jul 2014 23:37:38 +0200 Subject: case sensitive variable replacement --- mgagnome | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mgagnome b/mgagnome index 967a3ed..889005a 100755 --- a/mgagnome +++ b/mgagnome @@ -437,9 +437,10 @@ class SpecFile(object): # Into # name: SOMETHING converted_defines = [] - for search_for in ('name', 'version', 'release', 'summary', 'group'): - re_spec = re.compile(r'^(?P' + re.escape(search_for) + r'[ \t]*:[ \t]*)(?:\%' + re.escape(search_for) + r'|\%\{' + re.escape(search_for) + r'\})(?P[ \t]*\n)', re.MULTILINE + re.IGNORECASE) - re_variable = re.compile(r'^(?P\%define[ \t]+'+ re.escape(search_for) + r'[ \t]+(?P[^\n]+?))(?P[ \t]*\n)', re.MULTILINE + re.IGNORECASE) + for search_for in ('name', 'version', 'release', 'summary', 'Summary', 'group'): + search_for_ignore_case = ''.join(("[%s%s]" % (letter, letter.swapcase()) for letter in a)) + re_spec = re.compile(r'^(?P' + re.escape(search_for_ignore_case) + r'[ \t]*:[ \t]*)(?:\%' + re.escape(search_for) + r'|\%\{' + re.escape(search_for) + r'\})(?P[ \t]*\n)', re.MULTILINE) + re_variable = re.compile(r'^(?P\%define[ \t]+'+ re.escape(search_for) + r'[ \t]+(?P[^\n]+?))(?P[ \t]*\n)', re.MULTILINE) mo = re_variable.search(data) if mo and mo.group('definition') and len(re_variable.findall(data)) == 1: -- cgit v1.2.1