summaryrefslogtreecommitdiff
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-07-14 19:43:57 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-22 08:16:15 +0100
commitf7d250c97f40a737df9020180852d2ee87ca06b3 (patch)
tree81aa5d7625411981717983b7fb2c2d325f8183ff /meta/lib/oe
parent7ede979950fd265026c74526d8448627fd0a8c08 (diff)
downloadopenembedded-core-f7d250c97f40a737df9020180852d2ee87ca06b3.tar.gz
openembedded-core-f7d250c97f40a737df9020180852d2ee87ca06b3.tar.bz2
openembedded-core-f7d250c97f40a737df9020180852d2ee87ca06b3.zip
recipeutils.py: get_recipe_pv_without_srcpv remove prefixes from pv
Some recipes uses v or r prefixes in versions that makes wrong comparisions over recipes like lz4 r123 > 128. Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/recipeutils.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 83923e9961..9d45b4216e 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -645,6 +645,12 @@ def get_recipe_pv_without_srcpv(pv, uri_type):
pv = m.group('ver')
pfx = m.group('pfx')
sfx = m.group('sfx')
+ else:
+ regex = re.compile("(?P<pfx>(v|r|))(?P<ver>((\d+[\.\-_]*)+))")
+ m = regex.match(pv)
+ if m:
+ pv = m.group('ver')
+ pfx = m.group('pfx')
return (pv, pfx, sfx)