From 4f31d21bcb1c8c744e9abb33248715afe4a40af0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 31 Jul 2012 08:01:28 +0100 Subject: lib/oe/lsb.py: Map unknown distributions to 'Unknown' (From OE-Core rev: e12df2ca5c71ad672ebbfefbc47cabbac3333d61) Signed-off-by: Richard Purdie --- meta/lib/oe/lsb.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py index 36dd12fc80..c8852a2b65 100644 --- a/meta/lib/oe/lsb.py +++ b/meta/lib/oe/lsb.py @@ -5,7 +5,7 @@ def release_dict(): try: output, err = bb.process.run(['lsb_release', '-a'], stderr=PIPE) except bb.process.CmdError as exc: - return + return None data = {} for line in output.splitlines(): @@ -22,7 +22,13 @@ def distro_identifier(adjust_hook=None): with optional adjustment via a hook""" lsb_data = release_dict() - distro_id, release = lsb_data['Distributor ID'], lsb_data['Release'] + if lsb_data: + distro_id, release = lsb_data['Distributor ID'], lsb_data['Release'] + else: + distro_id, release = None, None + if adjust_hook: distro_id, release = adjust_hook(distro_id, release) + if not distro_id: + return "Unknown" return '{0}-{1}'.format(distro_id, release).replace(' ','-') -- cgit v1.2.3-54-g00ecf