diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-11-14 06:34:06 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 11:02:28 +0000 |
| commit | 3d8db6cb992f96023a0486f64fe6b0f1ead04184 (patch) | |
| tree | 76073ec02780c4275770e555fc93d7b698d7ea53 /meta/classes/sanity.bbclass | |
| parent | 0b31a03c59efea3a8742762772e39dcbd6f8ed25 (diff) | |
| download | openembedded-core-contrib-3d8db6cb992f96023a0486f64fe6b0f1ead04184.tar.gz | |
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 <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/sanity.bbclass')
| -rw-r--r-- | meta/classes/sanity.bbclass | 14 |
1 files changed, 9 insertions, 5 deletions
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() |