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 *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/meta/classes/pkg_metainfo.bbclass b/meta/classes/pkg_metainfo.bbclass
index ac4f73c77b..1714a535c2 100644
--- a/meta/classes/pkg_metainfo.bbclass
+++ b/meta/classes/pkg_metainfo.bbclass
@@ -1,5 +1,5 @@
 python do_pkg_write_metainfo () {
-	deploydir = bb.data.getVar('DEPLOY_DIR', d, 1)
+	deploydir = d.getVar('DEPLOY_DIR', 1)
 	if not deploydir:
 		bb.error("DEPLOY_DIR not defined, unable to write package info")
 		return
@@ -9,11 +9,11 @@ python do_pkg_write_metainfo () {
 	except OSError:
 		raise bb.build.FuncFailed("unable to open package-info file for writing.")
 	
-	name = bb.data.getVar('PN', d, 1)
-	version = bb.data.getVar('PV', d, 1)
-	desc = bb.data.getVar('DESCRIPTION', d, 1)
-	page = bb.data.getVar('HOMEPAGE', d, 1)
-	lic = bb.data.getVar('LICENSE', d, 1)
+	name = d.getVar('PN', 1)
+	version = d.getVar('PV', 1)
+	desc = d.getVar('DESCRIPTION', 1)
+	page = d.getVar('HOMEPAGE', 1)
+	lic = d.getVar('LICENSE', 1)
 	
 	infofile.write("|| "+ name +" || "+ version + " || "+ desc +" || "+ page +" || "+ lic + " ||\n" ) 
 	infofile.close()