From: Aníbal Limón <anibal.limon@linux.intel.com>
Date: Wed, 15 Jul 2015 00:43:57 +0000 (-0500)
Subject: recipeutils.py: get_recipe_pv_without_srcpv remove prefixes from pv
X-Git-Tag: 2015-10~1153
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f7d250c97f40a737df9020180852d2ee87ca06b3;p=openembedded-core.git

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>
---

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)