From 936eb9aac055f1d4f41bb351477a0f5bebf76a0e Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 8 Sep 2016 19:47:46 +0300 Subject: oeqa.buildperf: another fix for splitting 'nevr' string When processing buildstats we determine recipe name, epoch, version and revision from the per-recipe buildstat directory name. One previous patch made an assumption that package version starts with a number. That might not be true because of a packaging mistake or whatever reason. Thus, if a version starting with a number is not found, fall back to the "old" method of just taking the second-last dash-delimited part (the one before revision). Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- meta/lib/oeqa/buildperf/base.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/lib/oeqa') diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index 9700c05925..2c102554b9 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py @@ -428,6 +428,11 @@ class BuildPerfTestCase(unittest.TestCase): 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) + if not match: + # If we're not able to parse a version starting with a number, just + # take the part after last dash + match = re.match(r'^(?P\S+)-((?P[0-9]{1,5})_)?(?P[^-]+)$', + n_e_v) name = match.group('name') version = match.group('version') epoch = match.group('epoch') -- cgit 1.2.3-korg