Thanks, this addresses the issue well :) Alex
On Mon, 3 Jun 2019 at 10:49, Hongxu Jia <[email protected]> wrote: > 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 > <[email protected]> 7a97a7f937762ba342d5b2fd7cd090885a809835 > > With the commit: > INFO: ncurses 6.1+20181013 MATCH Hongxu Jia > <[email protected]> 7a97a7f937762ba342d5b2fd7cd090885a809835 > > Signed-off-by: Hongxu Jia <[email protected]> > --- > meta/lib/oe/recipeutils.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py > index 1e5b9a49f9..630ae967af 100644 > --- a/meta/lib/oe/recipeutils.py > +++ b/meta/lib/oe/recipeutils.py > @@ -934,7 +934,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type): > sfx = '' > > if uri_type == 'git': > - git_regex = > re.compile(r"(?P<pfx>v?)(?P<ver>[^\+]*)((?P<sfx>\+(git)?r?(AUTOINC\+))(?P<rev>.*))?") > + git_regex = > re.compile(r"(?P<pfx>v?)(?P<ver>.*?)(?P<sfx>\+[^\+]*(git)?r?(AUTOINC\+))(?P<rev>.*)") > m = git_regex.match(pv) > > if m: > -- > 2.21.0 > >
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
