From 9753283a3fe417ba827e4cee153184b6a25699de Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Jan 2013 11:46:30 +0000 Subject: bitbake: BBHandler/data: Standardise some setVar access formats (Bitbake rev: e12c1a485f96a4701144ac81179ae1af348e5bf3) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 6 +++--- bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 478a482d88..2c3e905a77 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -158,7 +158,7 @@ def expandKeys(alterdata, readdata = None): for key in todolist: ekey = todolist[key] - renameVar(key, ekey, alterdata) + alterdata.renameVar(key, ekey) def inheritFromOS(d, savedenv, permitted): """Inherit variables from the initial environment.""" @@ -166,9 +166,9 @@ def inheritFromOS(d, savedenv, permitted): for s in savedenv.keys(): if s in permitted: try: - setVar(s, getVar(s, savedenv, True), d) + d.setVar(s, getVar(s, savedenv, True)) if s in exportlist: - setVarFlag(s, "export", True, d) + d.setVarFlag(s, "export", True) except TypeError: pass diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 2ee8ebd28f..c585b60fee 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -84,7 +84,7 @@ def inherit(files, fn, lineno, d): if not file in __inherit_cache: logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file) __inherit_cache.append( file ) - data.setVar('__inherit_cache', __inherit_cache, d) + d.setVar('__inherit_cache', __inherit_cache) include(fn, file, lineno, d, "inherit") __inherit_cache = d.getVar('__inherit_cache') or [] @@ -134,7 +134,7 @@ def handle(fn, d, include): __inherit_cache = d.getVar('__inherit_cache') or [] if not fn in __inherit_cache: __inherit_cache.append(fn) - data.setVar('__inherit_cache', __inherit_cache, d) + d.setVar('__inherit_cache', __inherit_cache) if include != 0: oldfile = d.getVar('FILE') @@ -151,7 +151,7 @@ def handle(fn, d, include): # DONE WITH PARSING... time to evaluate if ext != ".bbclass": - data.setVar('FILE', abs_fn, d) + d.setVar('FILE', abs_fn) try: statements.eval(d) -- cgit v1.2.3-54-g00ecf