layerconfparse.py: remove unused layerbranch from parse_layer()

The layerbranch is not used in parse_layer(), so remove it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Robert Yang 2017-05-23 19:39:53 -07:00 committed by Paul Eggleton
parent 2735d9590a
commit a474dae060
3 changed files with 4 additions and 4 deletions

View File

@ -32,7 +32,7 @@ class LayerConfParse:
self.config_data_copy = bb.data.createCopy(self.tinfoil.config_data)
def parse_layer(self, layerbranch, layerdir):
def parse_layer(self, layerdir):
# This is not a valid layer, parsing will cause exception.
if not utils.is_layer_valid(layerdir):

View File

@ -377,7 +377,7 @@ def main():
layerdep.save()
layerconfparser = LayerConfParse(logger=logger)
try:
config_data = layerconfparser.parse_layer(layerbranch, layerdir)
config_data = layerconfparser.parse_layer(layerdir)
if config_data:
utils.add_dependencies(layerbranch, config_data, logger=logger)
utils.add_recommends(layerbranch, config_data, logger=logger)

View File

@ -267,7 +267,7 @@ def main():
sys.exit(0)
layerconfparser = layerconfparse.LayerConfParse(logger=logger, bitbakepath=bitbakepath, tinfoil=tinfoil)
config_data = layerconfparser.parse_layer(layerbranch, layerdir)
config_data = layerconfparser.parse_layer(layerdir)
if not config_data:
logger.debug("Layer %s does not appear to be valid for branch %s" % (layer.name, branchdesc))
sys.exit(0)
@ -355,7 +355,7 @@ def main():
logger.info("Collecting data for layer %s on branch %s" % (layer.name, branchdesc))
layerconfparser = layerconfparse.LayerConfParse(logger=logger, tinfoil=tinfoil)
layer_config_data = layerconfparser.parse_layer(layerbranch, layerdir)
layer_config_data = layerconfparser.parse_layer(layerdir)
if not layer_config_data:
logger.info("Skipping update of layer %s for branch %s - conf/layer.conf may have parse issues" % (layer.name, branchdesc))
layerconfparser.shutdown()