diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-01-16 09:58:25 +1300 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-01-16 13:08:18 +1300 |
commit | a5a3c47b694a661566b5fe64d5e7723365c26c92 (patch) | |
tree | a894109a73f80b007adc97d0c5e94692ac873f2a /layerindex/update.py | |
parent | 15748efcc18e0576dd9bee2acd8f35814f568c2d (diff) | |
download | openembedded-core-contrib-a5a3c47b694a661566b5fe64d5e7723365c26c92.tar.gz |
Fix layerconfparser lifetime handling
* Setting of the object has to be before the try: or otherwise the
finally block can get called if that doesn't succeed with the result
that the layerconfparser object won't have a value, which will
trigger an exception
* We shouldn't be using the config_data object after shutting down
tinfoil, so avoid doing that
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/update.py')
-rwxr-xr-x | layerindex/update.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/layerindex/update.py b/layerindex/update.py index 3a4df2f1e1..9529371c21 100755 --- a/layerindex/update.py +++ b/layerindex/update.py @@ -266,8 +266,8 @@ def main(): # dependencies that may have been missed. Note that creating the # dependencies is a best-effort and continues if they are not found. for branch in branches: + layerconfparser = LayerConfParse(logger=logger, bitbakepath=bitbakepath) try: - layerconfparser = LayerConfParse(logger=logger, bitbakepath=bitbakepath) for layer in layerquery: layerbranch = layer.get_layerbranch(branch) |