diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-03-08 10:13:06 +1300 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-03-14 15:19:53 +1300 |
| commit | 2919424f89d898849fb6112f1393f1aac2ca1563 (patch) | |
| tree | 1ec7abb3116f3762d61b66c7f3237c5e741c30e7 /layerindex/update_layer.py | |
| parent | d62b84f59389e6263e6343aee2be2dd73433602a (diff) | |
| download | openembedded-core-contrib-2919424f89d898849fb6112f1393f1aac2ca1563.tar.gz | |
update_layer.py: use DISTRO_NAME as primary distro short description
When reading conf/distro/*.conf to create distro records, attempt to
parse the config file and use DISTRO_NAME (if set) to populate the
description field for the record. If that's not set then fall back to
the less commonly used meta-comment that we supported previously.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/update_layer.py')
| -rw-r--r-- | layerindex/update_layer.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 705227b0d3..9fe96fbf25 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -133,7 +133,7 @@ def update_machine_conf_file(path, machine): break machine.description = desc -def update_distro_conf_file(path, distro): +def update_distro_conf_file(path, distro, d): logger.debug('Updating distro %s' % path) desc = "" with open(path, 'r') as f: @@ -144,7 +144,18 @@ def update_distro_conf_file(path, distro): desc = line[14:].strip() desc = re.sub(r'Distribution configuration for( running)*( an)*( the)*', '', desc) break - distro.description = desc + + distro_name = '' + try: + d = utils.parse_conf(path, d) + distro_name = d.getVar('DISTRO_NAME', True) + except Exception as e: + logger.warn('Error parsing distro configuration file %s: %s' % (path, str(e))) + + if distro_name: + distro.description = distro_name + else: + distro.description = desc def main(): if LooseVersion(git.__version__) < '0.3.1': @@ -531,7 +542,7 @@ def main(): distro = Distro() distro.layerbranch = layerbranch distro.name = filename - update_distro_conf_file(os.path.join(repodir, path), distro) + update_distro_conf_file(os.path.join(repodir, path), distro, config_data_copy) distro.save() elif typename == 'bbclass': bbclass = BBClass() @@ -568,7 +579,7 @@ def main(): results = layerdistros.filter(name=filename) if results: distro = results[0] - update_distro_conf_file(os.path.join(repodir, path), distro) + update_distro_conf_file(os.path.join(repodir, path), distro, config_data_copy) distro.save() deps = RecipeFileDependency.objects.filter(layerbranch=layerbranch).filter(path=path) @@ -642,7 +653,7 @@ def main(): distro = Distro() distro.layerbranch = layerbranch distro.name = filename - update_distro_conf_file(fullpath, distro) + update_distro_conf_file(fullpath, distro, config_data_copy) distro.save() elif typename == 'bbclass': bbclass = BBClass() |