From: Robert Yang Date: Mon, 14 Nov 2016 14:34:06 +0000 (-0800) Subject: sanity.bbclass: fix check_connectivity() for BB_NO_NETWORK = "0" X-Git-Tag: uninative-1.5~1371 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3d8db6cb992f96023a0486f64fe6b0f1ead04184;p=openembedded-core.git sanity.bbclass: fix check_connectivity() for BB_NO_NETWORK = "0" The old code: network_enabled = not d.getVar('BB_NO_NETWORK', True) It is True only when BB_NO_NETWORK is not set (None), but BB_NO_NETWORK = "0" should also be True while "1" means no network, "0" means need network in a normal case. Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 01bf5f780e..921b248b78 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -363,15 +363,19 @@ def check_connectivity(d): test_uris = (d.getVar('CONNECTIVITY_CHECK_URIS', True) or "").split() retval = "" + bbn = d.getVar('BB_NO_NETWORK', True) + if bbn not in (None, '0', '1'): + return 'BB_NO_NETWORK should be "0" or "1", but it is "%s"' % bbn + # Only check connectivity if network enabled and the # CONNECTIVITY_CHECK_URIS are set - network_enabled = not d.getVar('BB_NO_NETWORK', True) + network_enabled = not (bbn == '1') check_enabled = len(test_uris) - # Take a copy of the data store and unset MIRRORS and PREMIRRORS - data = bb.data.createCopy(d) - data.delVar('PREMIRRORS') - data.delVar('MIRRORS') if check_enabled and network_enabled: + # Take a copy of the data store and unset MIRRORS and PREMIRRORS + data = bb.data.createCopy(d) + data.delVar('PREMIRRORS') + data.delVar('MIRRORS') try: fetcher = bb.fetch2.Fetch(test_uris, data) fetcher.checkstatus()