Skip to contentSkip to conversation

lib/oe/lsb: Make sure the distro ID is always lowercased

PATCH New Peter Kjellerstedt 1 participant 1 message Sep 27, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/lib/oe/lsb.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/lib/oe/lsb.py +4 -4
index 4f2b419edc..43e46380d7 100644
@@ -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('/','-')
Signature · 1 line
2.21.0