From 4cd96710785eb05abeff1f281878655118d4a7dd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 25 Nov 2011 14:57:53 +0000 Subject: bitbake: Update users of getVar/setVar to use the data store functions directly Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-runtask | 6 +++--- bitbake/bin/bitdoc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/bitbake-runtask b/bitbake/bin/bitbake-runtask index 394b4c3ef9..6a0ecdc555 100755 --- a/bitbake/bin/bitbake-runtask +++ b/bitbake/bin/bitbake-runtask @@ -91,7 +91,7 @@ def register_idle_function(self, function, data): cooker = bb.cooker.BBCooker(config, register_idle_function, initialenv) config_data = cooker.configuration.data cooker.status = config_data -cooker.handleCollections(bb.data.getVar("BBFILE_COLLECTIONS", config_data, 1)) +cooker.handleCollections(config_data.getVar("BBFILE_COLLECTIONS", 1)) fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile) buildfile = cooker.matchFile(fn) @@ -108,9 +108,9 @@ if taskname.endswith("_setscene"): if hashdata: bb.parse.siggen.set_taskdata(hashdata["hashes"], hashdata["deps"]) for h in hashdata["hashes"]: - bb.data.setVar("BBHASH_%s" % h, hashdata["hashes"][h], the_data) + the_data.setVar("BBHASH_%s" % h, hashdata["hashes"][h]) for h in hashdata["deps"]: - bb.data.setVar("BBHASHDEPS_%s" % h, hashdata["deps"][h], the_data) + the_data.setVar("BBHASHDEPS_%s" % h, hashdata["deps"][h]) ret = 0 if dryrun != "True": diff --git a/bitbake/bin/bitdoc b/bitbake/bin/bitdoc index 08a0173d72..576d88b574 100755 --- a/bitbake/bin/bitdoc +++ b/bitbake/bin/bitdoc @@ -462,7 +462,7 @@ def main(): state_group = 2 for key in bb.data.keys(documentation): - data = bb.data.getVarFlag(key, "doc", documentation) + data = documentation.getVarFlag(key, "doc") if not data: continue -- cgit v1.2.3-54-g00ecf