summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-11-06 09:34:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:39 +0000
commitfd6bf771d0fa5cd1662ad51d3ae467fe75e7e801 (patch)
tree685a2d6708d702d8b0d63bf49575c5914262139d /meta/classes
parent7cebff6bdcabdb0bda51f3961b21912f6cd2c9ac (diff)
downloadpoky-fd6bf771d0fa5cd1662ad51d3ae467fe75e7e801.tar.gz
classes/distrodata: split SRC_URI properly before determining type
We weren't splitting SRC_URI values containing multiple URIs here; this didn't cause any errors except when a trailing ; was left on a URI, in which case the next URI was considered part of the parameter, which didn't contain a = and therefore was considered invalid. We only care about the first URI in SRC_URI in this context (since that's the upstream URI by convention) so split it as we should and take the first item. Fixes [YOCTO #8645]. (From OE-Core rev: 8e75b7e7d54e5638b42b9e7f90f2c6c17e62033f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/distrodata.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 5a4c1b6faf..44c06e1481 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -271,9 +271,9 @@ python do_checkpkg() {
271 from bb.fetch2 import FetchError, NoMethodError, decodeurl 271 from bb.fetch2 import FetchError, NoMethodError, decodeurl
272 272
273 """first check whether a uri is provided""" 273 """first check whether a uri is provided"""
274 src_uri = d.getVar('SRC_URI', True) 274 src_uri = (d.getVar('SRC_URI', True) or '').split()
275 if src_uri: 275 if src_uri:
276 uri_type, _, _, _, _, _ = decodeurl(src_uri) 276 uri_type, _, _, _, _, _ = decodeurl(src_uri[0])
277 else: 277 else:
278 uri_type = "none" 278 uri_type = "none"
279 279