From 91d3fce1eb3e27d646afba8cf3c03ae560412d1d Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 7 Sep 2016 10:28:45 +0300 Subject: oeqa.buildperf: try harder when splitting 'nevr' string Try to be more intelligent when splitting out recipe name, epoch, version and revision from the buildstat directory name. Previous assumption was that package versions never contain a dash but obviously that is not necessarily true. The new assumption is that the package version starts with a number. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- meta/lib/oeqa/buildperf/base.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index 2325cd1d6b..7dfb2bff37 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py @@ -425,8 +425,10 @@ class BuildPerfTestCase(unittest.TestCase): """Save buildstats""" def split_nevr(nevr): """Split name and version information from recipe "nevr" string""" - name, e_v, revision = nevr.rsplit('-', 2) - match = re.match(r'^((?P[0-9]{1,5})_)?(?P.*)$', e_v) + n_e_v, revision = nevr.rsplit('-', 1) + match = re.match(r'^(?P\S+)-((?P[0-9]{1,5})_)?(?P[0-9]\S*)$', + n_e_v) + name = match.group('name') version = match.group('version') epoch = match.group('epoch') return name, epoch, version, revision -- cgit 1.2.3-korg