From 4f7fdd0a590b2b370c641eca6e09adb1e4674c1c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 6 Nov 2015 09:34:05 +0000 Subject: 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 master rev: 8e75b7e7d54e5638b42b9e7f90f2c6c17e62033f) (From OE-Core rev: a28eba9fb03720c805eae02c3d0aebf9294e300b) Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/distrodata.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') 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() { from bb.fetch2 import FetchError, NoMethodError, decodeurl """first check whether a uri is provided""" - src_uri = d.getVar('SRC_URI', True) + src_uri = (d.getVar('SRC_URI', True) or '').split() if src_uri: - uri_type, _, _, _, _, _ = decodeurl(src_uri) + uri_type, _, _, _, _, _ = decodeurl(src_uri[0]) else: uri_type = "none" -- cgit v1.2.3-54-g00ecf