public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][kirkstone 13/15] oeqa/utils/metadata.py: Fix running oe-selftest running with no distro set
Date: Tue,  9 May 2023 12:32:39 -1000	[thread overview]
Message-ID: <6e63c48ec31ebf640ea26d0328f4618bd13e625f.1683671424.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1683671423.git.steve@sakoman.com>

From: Thomas Roos <throos@amazon.de>

This will use default values when no distribution is set.

[YOCTO #15086]

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>
---
 meta/lib/oeqa/utils/metadata.py | 6 +++---
 1 file 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():
     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()
-- 
2.34.1



  parent reply	other threads:[~2023-05-09 22:33 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-09 22:32 [OE-core][kirkstone 00/15] Patch review Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 01/15] git: fix CVE-2023-29007 Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 02/15] git: fix CVE-2023-25652 Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 03/15] libxml2: patch CVE-2023-28484 and CVE-2023-29469 Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 04/15] linux-yocto: Exclude 121 CVEs already fixed upstream Steve Sakoman
2023-05-10 15:32   ` Yoann Congal
2023-05-10 16:21     ` Steve Sakoman
2023-05-11 21:17   ` akuster808
2023-05-19 15:02     ` Marta Rybczynska
2023-05-09 22:32 ` [OE-core][kirkstone 05/15] wpebackend-fdo: upgrade 1.14.0 -> 1.14.2 Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 06/15] Revert "xserver-xorg: backport fix for CVE-2023-1393" Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 07/15] xserver-xorg: upgrade 21.1.7 -> 21.1.8 Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 08/15] linux-firmware: upgrade 20230210 -> 20230404 Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 09/15] kernel-devsrc: depend on python3-core instead of python3 Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 10/15] libarchive: Enable acls, xattr for native as well as target Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 11/15] populate_sdk_ext.bbclass: set METADATA_REVISION with an DISTRO override Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 12/15] libpam: Fix the xtests/tst-pam_motd[1|3] failures Steve Sakoman
2023-05-09 22:32 ` Steve Sakoman [this message]
2023-05-09 22:32 ` [OE-core][kirkstone 14/15] kernel: improve initramfs bundle processing time Steve Sakoman
2023-05-09 22:32 ` [OE-core][kirkstone 15/15] update-alternatives.bbclass: fix old override syntax Steve Sakoman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6e63c48ec31ebf640ea26d0328f4618bd13e625f.1683671424.git.steve@sakoman.com \
    --to=steve@sakoman.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox