diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-06-01 16:04:29 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-08 17:32:44 +0100 |
| commit | c1c3c9a4fbaf01a905f79b0970f98ccb221a3935 (patch) | |
| tree | 283bc04f86625c46e7851ac84ef0751ad53c8387 | |
| parent | fdc7f529be77be49b6c43cd24a4600ed97a35ed5 (diff) | |
| download | openembedded-core-c1c3c9a4fbaf01a905f79b0970f98ccb221a3935.tar.gz openembedded-core-c1c3c9a4fbaf01a905f79b0970f98ccb221a3935.tar.bz2 openembedded-core-c1c3c9a4fbaf01a905f79b0970f98ccb221a3935.zip | |
recipeutils: Improve get_recipe_pv_without_srcpv function
Use pv instead of rd this make the function more generic and
avoid copy recipe data.
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
| -rw-r--r-- | meta/lib/oe/recipeutils.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 37efefb093..26bbf3e5c9 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -626,23 +626,17 @@ def replace_dir_vars(path, d): path = path.replace(dirpath, '${%s}' % dirvars[dirpath]) return path -def get_recipe_pv_without_srcpv(rd, uri_type): +def get_recipe_pv_without_srcpv(pv, uri_type): """ Get PV without SRCPV common in SCM's for now only support git. Returns tuple with pv, prefix and suffix. """ - pv = '' pfx = '' sfx = '' if uri_type == 'git': - rd_tmp = rd.createCopy() - - rd_tmp.setVar('SRCPV', '') - pv = rd_tmp.getVar('PV', True) - git_regex = re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)") m = git_regex.match(pv) @@ -650,8 +644,6 @@ def get_recipe_pv_without_srcpv(rd, uri_type): pv = m.group('ver') pfx = m.group('pfx') sfx = m.group('sfx') - else: - pv = rd.getVar('PV', True) return (pv, pfx, sfx) @@ -704,7 +696,7 @@ def get_recipe_upstream_version(rd): pupver = ud.method.latest_versionstring(ud, rd) if uri_type == 'git': - (pv, pfx, sfx) = get_recipe_pv_without_srcpv(rd, uri_type) + (pv, pfx, sfx) = get_recipe_pv_without_srcpv(pv, uri_type) latest_revision = ud.method.latest_revision(ud, rd, ud.names[0]) |