diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-06 09:34:05 +0000 |
|---|---|---|
| committer |   Robert Yang <liezhi.yang@windriver.com> | 2015-12-27 23:03:15 -0800 |
| commit | a28eba9fb03720c805eae02c3d0aebf9294e300b (patch) | |
| tree | 3b4df625a2ed51c72019461134d8b6aeb0657312 /meta | |
| parent | b901a3057ff511f4c8bc730b37b967a93995de2f (diff) | |
| download | openembedded-core-contrib-a28eba9fb03720c805eae02c3d0aebf9294e300b.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 master 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')
| -rw-r--r-- | meta/classes/distrodata.bbclass | 4 |
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() { 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" |