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/packagehistory.bbclass b/meta/classes/packagehistory.bbclass
index 492bbac218..2cdf9d8a7c 100644
--- a/meta/classes/packagehistory.bbclass
+++ b/meta/classes/packagehistory.bbclass
@@ -10,8 +10,8 @@ PKGHIST_DIR = "${TMPDIR}/pkghistory/${BASEPKG_TARGET_SYS}/"
 # for comparision when writing future packages
 #
 python emit_pkghistory() {
-        packages = bb.data.getVar('PACKAGES', d, True)
-        pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True)
+        packages = d.getVar('PACKAGES', True)
+        pkghistdir = d.getVar('PKGHIST_DIR', True)
 
 
         # Should check PACKAGES here to see if anything removed
@@ -72,14 +72,14 @@ def check_pkghistory(pkg, pe, pv, pr, lastversion):
 def write_pkghistory(pkg, pe, pv, pr, d):
         bb.debug(2, "Writing package history")
 
-        pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True)
+        pkghistdir = d.getVar('PKGHIST_DIR', True)
 
         verpath = os.path.join(pkghistdir, pkg, pe, pv, pr)
         if not os.path.exists(verpath):
                 os.makedirs(verpath)
 
 def write_latestlink(pkg, pe, pv, pr, d):
-        pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True)
+        pkghistdir = d.getVar('PKGHIST_DIR', True)
 
         def rm_link(path):
                 try: