From d689b785c49badb82db189c0765e4aa91bc28cd8 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 23 May 2017 01:20:57 -0700 Subject: [PATCH] update_layer.py: set layerbranch's collection before add_dependencies The _add_dependency() uses: if layerbranch.collection: var_name = layerbranch.collection The layerbranch.collection is none if it is newly created, thus it can't get LAYERDEPENDS, because what defined in layer.conf is LAYERDEPENDS_, but what it would get is LAYERDEPENDS_, this patch can fix the problem. Reproducer: $ python3 update_layer.py -l mete-xfce -b --fullreload -d It would get None LAYERDEPENDS. Signed-off-by: Robert Yang Signed-off-by: Paul Eggleton --- layerindex/update_layer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 05ab3e7..bcf7056 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -360,9 +360,9 @@ def main(): logger.info("Skipping update of layer %s for branch %s - conf/layer.conf may have parse issues" % (layer.name, branchdesc)) layerconfparser.shutdown() sys.exit(1) + utils.set_layerbranch_collection_version(layerbranch, layer_config_data, logger=logger) utils.add_dependencies(layerbranch, layer_config_data, logger=logger) utils.add_recommends(layerbranch, layer_config_data, logger=logger) - utils.set_layerbranch_collection_version(layerbranch, layer_config_data, logger=logger) layerbranch.save() try: