diff options
| author | Thomas Roos <throos@amazon.de> | 2023-04-14 16:34:17 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-05-10 04:16:51 -1000 |
| commit | 40355fd859e7fd0a584b4b50fe9f9aef7f81ef2a (patch) | |
| tree | 05e73142272e73ed54569cce7aa3f280e7aea297 | |
| parent | eb319d974c6d9583d7962cf0bd18be2a3ed885fc (diff) | |
| download | poky-40355fd859e7fd0a584b4b50fe9f9aef7f81ef2a.tar.gz | |
oeqa/utils/metadata.py: Fix running oe-selftest running with no distro set
This will use default values when no distribution is set.
[YOCTO #15086]
(From OE-Core rev: 9e576ab7035d52fba961c400d53657608ad5b99d)
Signed-off-by: Thomas Roos <throos@amazon.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 888fe63b46efceeff08dbe8c4f66fec33d06cb7a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/lib/oeqa/utils/metadata.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py index 8013aa684d..15ec190c4a 100644 --- a/meta/lib/oeqa/utils/metadata.py +++ b/meta/lib/oeqa/utils/metadata.py | |||
| @@ -27,9 +27,9 @@ def metadata_from_bb(): | |||
| 27 | data_dict = get_bb_vars() | 27 | data_dict = get_bb_vars() |
| 28 | 28 | ||
| 29 | # Distro information | 29 | # Distro information |
| 30 | info_dict['distro'] = {'id': data_dict['DISTRO'], | 30 | info_dict['distro'] = {'id': data_dict.get('DISTRO', 'NODISTRO'), |
| 31 | 'version_id': data_dict['DISTRO_VERSION'], | 31 | 'version_id': data_dict.get('DISTRO_VERSION', 'NO_DISTRO_VERSION'), |
| 32 | 'pretty_name': '%s %s' % (data_dict['DISTRO'], data_dict['DISTRO_VERSION'])} | 32 | 'pretty_name': '%s %s' % (data_dict.get('DISTRO', 'NODISTRO'), data_dict.get('DISTRO_VERSION', 'NO_DISTRO_VERSION'))} |
| 33 | 33 | ||
| 34 | # Host distro information | 34 | # Host distro information |
| 35 | os_release = get_os_release() | 35 | os_release = get_os_release() |