diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-07-14 19:43:57 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-23 08:48:37 +0100 |
commit | 6deffe1258c17cf30bdbcd1a234102dd3c5edd10 (patch) | |
tree | 00ac3162b03d74854765b4ebf1dfef58d7499be0 | |
parent | 74240ccbfac1a0166d26045ecebae2f0a767d57d (diff) | |
download | poky-6deffe1258c17cf30bdbcd1a234102dd3c5edd10.tar.gz |
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.
(From OE-Core rev: f7d250c97f40a737df9020180852d2ee87ca06b3)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/recipeutils.py | 6 |
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): | |||
645 | pv = m.group('ver') | 645 | pv = m.group('ver') |
646 | pfx = m.group('pfx') | 646 | pfx = m.group('pfx') |
647 | sfx = m.group('sfx') | 647 | sfx = m.group('sfx') |
648 | else: | ||
649 | regex = re.compile("(?P<pfx>(v|r|))(?P<ver>((\d+[\.\-_]*)+))") | ||
650 | m = regex.match(pv) | ||
651 | if m: | ||
652 | pv = m.group('ver') | ||
653 | pfx = m.group('pfx') | ||
648 | 654 | ||
649 | return (pv, pfx, sfx) | 655 | return (pv, pfx, sfx) |
650 | 656 | ||