From: Aníbal Limón <anibal.limon@linux.intel.com>
Date: Wed, 15 Jul 2015 00:43:55 +0000 (-0500)
Subject: oe/recipeutils.py: get_recipe_upstream_info only use sfx and pfx when exits
X-Git-Tag: 2015-10~1155
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=382833cc7e7603241838e18e429f69da0c2ee4ac;p=openembedded-core.git

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

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

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