diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-06 09:34:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-12 08:42:27 +0000 |
commit | 4f7fdd0a590b2b370c641eca6e09adb1e4674c1c (patch) | |
tree | 36d3b01f70e45f13bb82d43eb079f583e2f2c047 /meta/classes | |
parent | 3b7df5507588735e5e330a14456b41aa9787dcf1 (diff) | |
download | poky-4f7fdd0a590b2b370c641eca6e09adb1e4674c1c.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)
(From OE-Core rev: a28eba9fb03720c805eae02c3d0aebf9294e300b)
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.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() { | |||
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 | ||