diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2017-05-23 01:20:57 -0700 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-07-21 08:14:57 +0200 |
| commit | d689b785c49badb82db189c0765e4aa91bc28cd8 (patch) | |
| tree | 6b5effe9df5650207f91d596028970e0a6302f59 /layerindex/update_layer.py | |
| parent | a4d14191f4f80f44b783474df3da495269124cb8 (diff) | |
| download | openembedded-core-contrib-d689b785c49badb82db189c0765e4aa91bc28cd8.tar.gz | |
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_<collection>,
but what it would get is LAYERDEPENDS_<layer_name>, this patch can fix the
problem.
Reproducer:
$ python3 update_layer.py -l mete-xfce -b <newbranch> --fullreload -d
It would get None LAYERDEPENDS.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/update_layer.py')
| -rw-r--r-- | layerindex/update_layer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 05ab3e7dab..bcf70560dd 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: |