The layerbranch is not used in parse_layer(), so remove it.
Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
---
layerindex/layerconfparse.py | 2 +-
layerindex/tools/import_layer.py | 2 +-
layerindex/update_layer.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/layerindex/layerconfparse.py b/layerindex/layerconfparse.py
index d599ed5..526d2c2 100644
--- a/layerindex/layerconfparse.py
+++ b/layerindex/layerconfparse.py
@@ -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):
diff --git a/layerindex/tools/import_layer.py b/layerindex/tools/import_layer.py
index ad16e40..a806dd1 100755
--- a/layerindex/tools/import_layer.py
+++ b/layerindex/tools/import_layer.py
@@ -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)
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index 9fe96fb..05ab3e7 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -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()
--
2.10.2
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
