]> code.ossystems Code Review - openembedded-core.git/commit
lib/oe/reciputils.py: support character `+' in git pv
authorHongxu Jia <hongxu.jia@windriver.com>
Mon, 3 Jun 2019 08:49:20 +0000 (01:49 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 4 Jun 2019 08:09:33 +0000 (09:09 +0100)
commit8049bd34b89e710f7bb20883813ba3f929d9e997
treedcf750024401fe93fbe36961b6ec27d06f015f54
parent62c3c8277fcea61940a4433d3796a4cec1b5f577
lib/oe/reciputils.py: support character `+' in git pv

While pv contains char `+' (such as ncurses 6.1+20181013),
it was incorrectly converted to `6.1'

In this commit:
- Convert [^\+]* to .*?
  Support pv to contain char `+' and not greedy match
  (Such as ncurses 6.1+20181013)

- Add [^\+] to sfx match
  Support sfx contains extra chars between `+' and `git'
  (such as asciidoc "8.6.9+py3-gitAUTOINC+618f6e6f6b")

- Make sfx and rev greedy match

Run `devtool check-upgrade-status --all' in poky and compare results,
only one difference on ncurses version:
Without the commit:
INFO: ncurses                   6.1             6.1+20181013    Hongxu Jia <hongxu.jia@windriver.com> 7a97a7f937762ba342d5b2fd7cd090885a809835

With the commit:
INFO: ncurses                   6.1+20181013    MATCH           Hongxu Jia <hongxu.jia@windriver.com> 7a97a7f937762ba342d5b2fd7cd090885a809835

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/recipeutils.py