diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-03 19:29:54 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-09 15:14:32 -0700 |
| commit | ab609c471d85be3248b789c8ab2813957cd97e29 (patch) | |
| tree | 6aee87c34581d86b6fdd029d266a74a71acb3ab1 | |
| parent | 3f5d6405a0f4a5de14f7aebe430160c2256bf218 (diff) | |
| download | openembedded-core-ab609c471d85be3248b789c8ab2813957cd97e29.tar.gz openembedded-core-ab609c471d85be3248b789c8ab2813957cd97e29.tar.bz2 openembedded-core-ab609c471d85be3248b789c8ab2813957cd97e29.zip | |
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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/recipeutils.py | 4 |
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): sfx = '' if uri_type == 'git': - git_regex = re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)") + git_regex = re.compile("(?P<pfx>v?)(?P<ver>[^\+]*)((?P<sfx>\+(git)?r?(AUTOINC\+))(?P<rev>.*))?") m = git_regex.match(pv) if m: @@ -646,7 +646,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type): pfx = m.group('pfx') sfx = m.group('sfx') else: - regex = re.compile("(?P<pfx>(v|r|))(?P<ver>((\d+[\.\-_]*)+))") + regex = re.compile("(?P<pfx>(v|r)?)(?P<ver>.*)") m = regex.match(pv) if m: pv = m.group('ver') |