summaryrefslogtreecommitdiffstats
path: root/meta/classes/sanity.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-09 15:00:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:51:19 +0000
commitc8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch)
tree5f1b86954646a0f3bb914407994388a6a4346769 /meta/classes/sanity.bbclass
parent5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff)
downloadpoky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.tar.gz
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r--meta/classes/sanity.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 838448f33c..53b82d73e3 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -14,7 +14,7 @@ def raise_sanity_error(msg):
14def check_conf_exists(fn, data): 14def check_conf_exists(fn, data):
15 bbpath = [] 15 bbpath = []
16 fn = bb.data.expand(fn, data) 16 fn = bb.data.expand(fn, data)
17 vbbpath = bb.data.getVar("BBPATH", data) 17 vbbpath = data.getVar("BBPATH")
18 if vbbpath: 18 if vbbpath:
19 bbpath += vbbpath.split(":") 19 bbpath += vbbpath.split(":")
20 for p in bbpath: 20 for p in bbpath:
@@ -87,12 +87,12 @@ def check_connectivity(d):
87 # URI's to check can be set in the CONNECTIVITY_CHECK_URIS variable 87 # URI's to check can be set in the CONNECTIVITY_CHECK_URIS variable
88 # using the same syntax as for SRC_URI. If the variable is not set 88 # using the same syntax as for SRC_URI. If the variable is not set
89 # the check is skipped 89 # the check is skipped
90 test_uris = (bb.data.getVar('CONNECTIVITY_CHECK_URIS', d, True) or "").split() 90 test_uris = (d.getVar('CONNECTIVITY_CHECK_URIS', True) or "").split()
91 retval = "" 91 retval = ""
92 92
93 # Only check connectivity if network enabled and the 93 # Only check connectivity if network enabled and the
94 # CONNECTIVITY_CHECK_URIS are set 94 # CONNECTIVITY_CHECK_URIS are set
95 network_enabled = not bb.data.getVar('BB_NO_NETWORK', d, True) 95 network_enabled = not d.getVar('BB_NO_NETWORK', True)
96 check_enabled = len(test_uris) 96 check_enabled = len(test_uris)
97 # Take a copy of the data store and unset MIRRORS and PREMIRROS 97 # Take a copy of the data store and unset MIRRORS and PREMIRROS
98 data = bb.data.createCopy(d) 98 data = bb.data.createCopy(d)
@@ -105,7 +105,7 @@ def check_connectivity(d):
105 except Exception: 105 except Exception:
106 # Allow the message to be configured so that users can be 106 # Allow the message to be configured so that users can be
107 # pointed to a support mechanism. 107 # pointed to a support mechanism.
108 msg = bb.data.getVar('CONNECTIVITY_CHECK_MSG', data, True) or "" 108 msg = data.getVar('CONNECTIVITY_CHECK_MSG', True) or ""
109 if len(msg) == 0: 109 if len(msg) == 0:
110 msg = "Failed to fetch test data from the network. Please ensure your network is configured correctly.\n" 110 msg = "Failed to fetch test data from the network. Please ensure your network is configured correctly.\n"
111 retval = msg 111 retval = msg
@@ -450,7 +450,7 @@ def check_sanity(e):
450 450
451addhandler check_sanity_eventhandler 451addhandler check_sanity_eventhandler
452python check_sanity_eventhandler() { 452python check_sanity_eventhandler() {
453 if bb.event.getName(e) == "ConfigParsed" and bb.data.getVar("BB_WORKERCONTEXT", e.data, True) != "1": 453 if bb.event.getName(e) == "ConfigParsed" and e.data.getVar("BB_WORKERCONTEXT", True) != "1":
454 check_sanity(e) 454 check_sanity(e)
455 455
456 return 456 return