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>

1 files changed, 4 insertions, 4 deletions

diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index 64bd84a5d3..009ef1fd04 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -6,7 +6,7 @@ python do_listtasks() {
 	#bb.data.emit_env(sys.__stdout__, d)
 	# emit the metadata which isnt valid shell
 	for e in d.keys():
-		if bb.data.getVarFlag(e, 'task', d):
+		if d.getVarFlag(e, 'task'):
 			bb.plain("%s" % e)
 }
 
@@ -20,18 +20,18 @@ python do_clean() {
 	bb.note("Removing " + dir)
 	oe.path.remove(dir)
 
-	dir = "%s.*" % bb.data.expand(bb.data.getVar('STAMP', d), d)
+	dir = "%s.*" % bb.data.expand(d.getVar('STAMP'), d)
 	bb.note("Removing " + dir)
 	oe.path.remove(dir)
 
-	for f in (bb.data.getVar('CLEANFUNCS', d, 1) or '').split():
+	for f in (d.getVar('CLEANFUNCS', 1) or '').split():
 		bb.build.exec_func(f, d)
 }
 
 addtask checkuri
 do_checkuri[nostamp] = "1"
 python do_checkuri() {
-	src_uri = (bb.data.getVar('SRC_URI', d, True) or "").split()
+	src_uri = (d.getVar('SRC_URI', True) or "").split()
 	if len(src_uri) == 0:
 		return