[oe-commits] Richard Purdie : lib/oe/lsb.py: Map unknown distributions to 'Unknown'

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e12df2ca5c71ad672ebbfefbc47cabbac3333d61
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e12df2ca5c71ad672ebbfefbc47cabbac3333d61

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Jul 31 08:01:28 2012 +0100

lib/oe/lsb.py: Map unknown distributions to 'Unknown'

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oe/lsb.py |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py
index 36dd12f..c8852a2 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(' ','-')