From 25182cd84956ff233f9e364dfe777b18944d0ae8 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 22 May 2013 15:25:13 +0100 Subject: bitbake: cookerdata: rename _parse to parse_config_file We use this externally in the OE layer index update script, so it shouldn't really be named as an internal function. (Bitbake rev: 89332a7874e94c8d91ea24200f9739abb1a50397) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/cookerdata.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/bb/cookerdata.py') diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index 70e22b4a56..c4a28c86c5 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py @@ -147,7 +147,7 @@ def catch_parse_error(func): return wrapped @catch_parse_error -def _parse(fn, data, include=True): +def parse_config_file(fn, data, include=True): return bb.parse.handle(fn, data, include) @catch_parse_error @@ -211,12 +211,12 @@ class CookerDataBuilder(object): # Parse files for loading *before* bitbake.conf and any includes for f in prefiles: - data = _parse(f, data) + data = parse_config_file(f, data) layerconf = self._findLayerConf() if layerconf: parselog.debug(2, "Found bblayers.conf (%s)", layerconf) - data = _parse(layerconf, data) + data = parse_config_file(layerconf, data) layers = (data.getVar('BBLAYERS', True) or "").split() @@ -224,7 +224,7 @@ class CookerDataBuilder(object): for layer in layers: parselog.debug(2, "Adding layer %s", layer) data.setVar('LAYERDIR', layer) - data = _parse(os.path.join(layer, "conf", "layer.conf"), data) + data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data) data.expandVarref('LAYERDIR') data.delVar('LAYERDIR') @@ -232,11 +232,11 @@ class CookerDataBuilder(object): if not data.getVar("BBPATH", True): raise SystemExit("The BBPATH variable is not set") - data = _parse(os.path.join("conf", "bitbake.conf"), data) + data = parse_config_file(os.path.join("conf", "bitbake.conf"), data) # Parse files for loading *after* bitbake.conf and any includes for p in postfiles: - data = _parse(p, data) + data = parse_config_file(p, data) # Handle any INHERITs and inherit the base class bbclasses = ["base"] + (data.getVar('INHERIT', True) or "").split() -- cgit v1.2.3-54-g00ecf