sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Paul Eggleton 2015-11-06 09:34:05 +00:00 committed by Richard Purdie
parent 7cebff6bdc
commit fd6bf771d0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/distrodata.bbclass
View File

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