From 602a3ebec7314527baaf2e73a1489b48f8f70925 Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Fri, 14 Apr 2023 16:34:17 +0200 Subject: 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: 1a28c6cfe0e6c4b44d01778f8034231040c6d4ad) Signed-off-by: Thomas Roos Signed-off-by: Luca Ceresoli (cherry picked from commit 888fe63b46efceeff08dbe8c4f66fec33d06cb7a) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/metadata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/lib/oeqa') 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(): data_dict = get_bb_vars() # Distro information - info_dict['distro'] = {'id': data_dict['DISTRO'], - 'version_id': data_dict['DISTRO_VERSION'], - 'pretty_name': '%s %s' % (data_dict['DISTRO'], data_dict['DISTRO_VERSION'])} + info_dict['distro'] = {'id': data_dict.get('DISTRO', 'NODISTRO'), + 'version_id': data_dict.get('DISTRO_VERSION', 'NO_DISTRO_VERSION'), + 'pretty_name': '%s %s' % (data_dict.get('DISTRO', 'NODISTRO'), data_dict.get('DISTRO_VERSION', 'NO_DISTRO_VERSION'))} # Host distro information os_release = get_os_release() -- cgit v1.2.3-54-g00ecf