[oe-commits] [openembedded-core] 15/40: oeqa.buildperf: another fix for splitting 'nevr' string

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 936eb9aac055f1d4f41bb351477a0f5bebf76a0e
Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
AuthorDate: Thu Sep 8 19:47:46 2016 +0300

    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 <markus.lehtonen at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oeqa/buildperf/base.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 9700c05..2c10255 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<name>\S+)-((?P<epoch>[0-9]{1,5})_)?(?P<version>[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<name>\S+)-((?P<epoch>[0-9]{1,5})_)?(?P<version>[^-]+)$',
+                                 n_e_v)
             name = match.group('name')
             version = match.group('version')
             epoch = match.group('epoch')

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.