[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5908/8267] oe-build-perf-report: accept parenthesis in tag names



commit cdb02b7d93fadbb6839312fc3ee9177e38b0391a
Author: Markus Lehtonen <markus lehtonen linux intel com>
Date:   Thu May 4 14:49:57 2017 +0300

    oe-build-perf-report: accept parenthesis in tag names
    
    (From OE-Core rev: b1feae0e23300ea3894d14d2e7b1c1f8b419146e)
    
    Signed-off-by: Markus Lehtonen <markus lehtonen linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/oe-build-perf-report |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report
index ced5ff2..876e3b1 100755
--- a/scripts/oe-build-perf-report
+++ b/scripts/oe-build-perf-report
@@ -62,11 +62,13 @@ def get_test_runs(repo, tag_name, **kwargs):
     log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern)
 
     # Parse undefined fields from tag names
-    str_fields = dict([(f, r'(?P<{}>[\w\-.]+)'.format(f)) for f in field_names])
+    str_fields = dict([(f, r'(?P<{}>[\w\-.()]+)'.format(f)) for f in field_names])
     str_fields['commit'] = '(?P<commit>[0-9a-f]{7,40})'
     str_fields['commit_number'] = '(?P<commit_number>[0-9]{1,7})'
     str_fields['tag_number'] = '(?P<tag_number>[0-9]{1,5})'
-    str_fields.update(kwargs)
+    # escape parenthesis in fields in order to not messa up the regexp
+    fixed_fields = dict([(k, v.replace('(', r'\(').replace(')', r'\)')) for k, v in kwargs.items()])
+    str_fields.update(fixed_fields)
     tag_re = re.compile(tag_name.format(**str_fields))
 
     # Parse fields from tags


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]