[oe-commits] [openembedded-core] 04/10: lib/oe/lsb: Make sure the distro ID is always lowercased

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 4ba7ef79d23a4cf688d7a794064893fe5f2f473b
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Fri Sep 27 12:33:52 2019 +0200

    lib/oe/lsb: Make sure the distro ID is always lowercased
    
    In commit 8689e561 (lib/oe/lsb: attempt to ensure consistent distro id
    regardless of source), the distro ID returned by
    oe.lsb.distro_identifier() was lowercased, but only if a release
    version is also present.
    
    This changes the code to always lowercase the distro ID, including the
    default distro ID "unknown", which is used if no other ID can be
    identified.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/lsb.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py
index 4f2b419..43e4638 100644
--- a/meta/lib/oe/lsb.py
+++ b/meta/lib/oe/lsb.py
@@ -110,12 +110,12 @@ def distro_identifier(adjust_hook=None):
     if adjust_hook:
         distro_id, release = adjust_hook(distro_id, release)
     if not distro_id:
-        return "Unknown"
-    # Filter out any non-alphanumerics
-    distro_id = re.sub(r'\W', '', distro_id)
+        return "unknown"
+    # Filter out any non-alphanumerics and convert to lowercase
+    distro_id = re.sub(r'\W', '', distro_id).lower()
 
     if release:
-        id_str = '{0}-{1}'.format(distro_id.lower(), release)
+        id_str = '{0}-{1}'.format(distro_id, release)
     else:
         id_str = distro_id
     return id_str.replace(' ','-').replace('/','-')

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.