From e28c1eb70886248f3ea5407ab0ecbbfde78e41ff Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Tue, 14 Jul 2015 19:43:55 -0500 Subject: oe/recipeutils.py: get_recipe_upstream_info only use sfx and pfx when exits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie --- meta/lib/oe/recipeutils.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'meta/lib/oe/recipeutils.py') diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 78d69267ac..16530ee179 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -708,14 +708,21 @@ def get_recipe_upstream_version(rd): if uri_type == 'git': (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 pupver == '' and latest_revision: + if pupver == '' and revision: pupver = pv 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 != '': ru['version'] = pupver -- cgit v1.2.3-54-g00ecf