[oe-commits] [openembedded-core] 12/30: lib/oe/reciputils.py: support character `+' in git pv

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

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

commit 65e2b1a2333a2268f4ee7de6a20cb13ec697b50e
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Mon Jun 3 01:49:20 2019 -0700

    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 at windriver.com> 7a97a7f937762ba342d5b2fd7cd090885a809835
    
    With the commit:
    INFO: ncurses                   6.1+20181013    MATCH           Hongxu Jia <hongxu.jia at windriver.com> 7a97a7f937762ba342d5b2fd7cd090885a809835
    
    Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 4ca200d..874b99b 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -932,7 +932,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:

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