mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

oe/recipeutils.py: get_recipe_upstream_info only use sfx and pfx when exits

Browse Source 
Don't use pfx and sfx when not exist because cause formatting errors
like 2.9HASH instead of 2.9+gitAUTOINC+HASH.

(From OE-Core rev: 382833cc7e7603241838e18e429f69da0c2ee4ac)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón
2015-07-14 19:43:55 -05:00
committed by Richard Purdie
parent 205c39bf78
commit e28c1eb708
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/recipeutils.py
+10 -3
View File
@@ -708,14 +708,21 @@ def get_recipe_upstream_version(rd):
if uri_type == 'git': if uri_type == 'git':
(pv, pfx, sfx) = get_recipe_pv_without_srcpv(pv, uri_type) (pv, pfx, sfx) = get_recipe_pv_without_srcpv(pv, uri_type)
latest_revision = ud.method.latest_revision(ud, rd, ud.names[0]) revision = ud.method.latest_revision(ud, rd, ud.names[0])
# if contains revision but not pupver use current pv # if contains revision but not pupver use current pv
if pupver == '' and latest_revision: if pupver == '' and revision:
pupver = pv pupver = pv
if pupver != '': if pupver != '':
pupver = pfx + pupver + sfx + latest_revision[:10] tmp = pupver
pupver = ''
if pfx:
pupver = pfx
pupver = pupver + tmp
if sfx:
pupver = pupver + sfx + revision[:10]
if pupver != '': if pupver != '':
ru['version'] = pupver ru['version'] = pupver