summaryrefslogtreecommitdiffstats
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:37:16 +0000
commit8e75b7e7d54e5638b42b9e7f90f2c6c17e62033f (patch)
tree4be2b6a50b57de5410ca367dbce73bdd67dca3f3
parentafe100436bdeefb024b924ee27ad68830f085ff4 (diff)
downloadopenembedded-core-contrib-8e75b7e7d54e5638b42b9e7f90f2c6c17e62033f.tar.gz
openembedded-core-contrib-8e75b7e7d54e5638b42b9e7f90f2c6c17e62033f.tar.bz2
openembedded-core-contrib-8e75b7e7d54e5638b42b9e7f90f2c6c17e62033f.zip
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]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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() {
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"