diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2017-05-23 19:39:53 -0700 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-07-21 08:14:57 +0200 |
| commit | a474dae0600f62b0f3d5838222dafcb885e87afe (patch) | |
| tree | 9787e41e89b1dc39b1a34fb27e235122155c0270 /layerindex | |
| parent | 2735d9590a0b84addc044013e2f51d3feac210d5 (diff) | |
| download | openembedded-core-contrib-a474dae0600f62b0f3d5838222dafcb885e87afe.tar.gz | |
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>
Diffstat (limited to 'layerindex')
| -rw-r--r-- | layerindex/layerconfparse.py | 2 | ||||
| -rwxr-xr-x | layerindex/tools/import_layer.py | 2 | ||||
| -rw-r--r-- | layerindex/update_layer.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/layerindex/layerconfparse.py b/layerindex/layerconfparse.py index d599ed56b1..526d2c23a9 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 ad16e40f9d..a806dd100c 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 9fe96fbf25..05ab3e7dab 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() |