diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-08-25 08:29:30 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-25 08:49:12 -0700 |
| commit | 81aa4bfbde871af1d569b64499c34a315bf6218e (patch) | |
| tree | b2e0bbc89d176187f83e99af8935427d3f840995 /meta | |
| parent | 2be439c14790fec8ad7ffe1b6c531d41d0329eaf (diff) | |
| download | openembedded-core-81aa4bfbde871af1d569b64499c34a315bf6218e.tar.gz openembedded-core-81aa4bfbde871af1d569b64499c34a315bf6218e.tar.bz2 openembedded-core-81aa4bfbde871af1d569b64499c34a315bf6218e.zip | |
classes/sanity: enhance the network connectivity test
Switch to use the checkstatus fetcher API for the network connectivity test,
this has several advantages:
* we no longer print any messages to the console whilst the check is
being run
* we don't actually download anything, removing the need for tidy up and
making the code more concise
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/sanity.bbclass | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 16af0293d9..cefe6a483e 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -95,15 +95,9 @@ def check_connectivity(d): network_enabled = not bb.data.getVar('BB_NO_NETWORK', d, True) check_enabled = len(test_uris) if check_enabled and network_enabled: - data = bb.data.createCopy(d) - bookmark = os.getcwd() - dldir = bb.data.expand('${TMPDIR}/sanity', data) - bb.data.setVar('DL_DIR', dldir, data) - try: - fetcher = bb.fetch2.Fetch(test_uris, data) - fetcher.download() - fetcher.clean(test_uris) + fetcher = bb.fetch2.Fetch(test_uris, d) + fetcher.checkstatus() except Exception: # Allow the message to be configured so that users can be # pointed to a support mechanism. @@ -111,10 +105,6 @@ def check_connectivity(d): if len(msg) == 0: msg = "Failed to fetch test data from the network. Please ensure your network is configured correctly.\n" retval = msg - finally: - # Make sure we tidy up the cruft - oe.path.remove(dldir) - os.chdir(bookmark) return retval |