summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-08-03 19:29:54 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-10 12:40:32 -0700
commit309982f60aa3226d006cf7748dfce1fb54b32333 (patch)
tree8ff9c859086a303e37ee93a98d91786d908f1db8 /meta/lib
parentaa8225f9d1f630b0a9885ea50cdcc269315f9228 (diff)
downloadpoky-309982f60aa3226d006cf7748dfce1fb54b32333.tar.gz
recipeutils.py: allow all characters in regexes used to parse version strings
Previously only numeric characters were matches and anything else was discarded, so 4.0-rc3, 2005e, 1.0.2a and similar versions got truncated. (From OE-Core rev: ab609c471d85be3248b789c8ab2813957cd97e29) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/recipeutils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 9d45b4216e..cd742130de 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -638,7 +638,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type):
638 sfx = '' 638 sfx = ''
639 639
640 if uri_type == 'git': 640 if uri_type == 'git':
641 git_regex = re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)") 641 git_regex = re.compile("(?P<pfx>v?)(?P<ver>[^\+]*)((?P<sfx>\+(git)?r?(AUTOINC\+))(?P<rev>.*))?")
642 m = git_regex.match(pv) 642 m = git_regex.match(pv)
643 643
644 if m: 644 if m:
@@ -646,7 +646,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type):
646 pfx = m.group('pfx') 646 pfx = m.group('pfx')
647 sfx = m.group('sfx') 647 sfx = m.group('sfx')
648 else: 648 else:
649 regex = re.compile("(?P<pfx>(v|r|))(?P<ver>((\d+[\.\-_]*)+))") 649 regex = re.compile("(?P<pfx>(v|r)?)(?P<ver>.*)")
650 m = regex.match(pv) 650 m = regex.match(pv)
651 if m: 651 if m:
652 pv = m.group('ver') 652 pv = m.group('ver')