sanity: disable mirrors for connectivity check

It's difficult to test a range of fetchers when using mirrors, therefore create a throwaway
copy of the datastore and delete the MIRROR and PREMIRROR variables to ensure they aren't
used in the connectivity check.

(From OE-Core rev: 31cb3974eeaf2a808e8da3864e70986578c58cb9)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Lock
2011-09-14 15:09:28 -07:00
committed by Richard Purdie
parent 6be481711a
commit dfc13c9ae7

View File

@@ -94,14 +94,18 @@ def check_connectivity(d):
# CONNECTIVITY_CHECK_URIS are set
network_enabled = not bb.data.getVar('BB_NO_NETWORK', d, True)
check_enabled = len(test_uris)
# Take a copy of the data store and unset MIRRORS and PREMIRROS
data = bb.data.createCopy(d)
data.delVar('PREMIRRORS')
data.delVar('MIRRORS')
if check_enabled and network_enabled:
try:
fetcher = bb.fetch2.Fetch(test_uris, d)
fetcher = bb.fetch2.Fetch(test_uris, data)
fetcher.checkstatus()
except Exception:
# Allow the message to be configured so that users can be
# pointed to a support mechanism.
msg = bb.data.getVar('CONNECTIVITY_CHECK_MSG', d, True) or ""
msg = bb.data.getVar('CONNECTIVITY_CHECK_MSG', data, True) or ""
if len(msg) == 0:
msg = "Failed to fetch test data from the network. Please ensure your network is configured correctly.\n"
retval = msg