[rtems-source-builder commit] sb/linux.py: Simplify "distro" determination

Sebastian Huber sebh at rtems.org
Mon Jan 24 06:48:42 UTC 2022


Module:    rtems-source-builder
Branch:    master
Commit:    09b84c4c2ab1abddc3f06f98db3170eff6a8edd1
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=09b84c4c2ab1abddc3f06f98db3170eff6a8edd1

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Jan 20 12:48:53 2022 +0100

sb/linux.py: Simplify "distro" determination

This fixes an issue on Debian 11 which contains "Debian" in /etc/issue
(capital D).

---

 source-builder/sb/linux.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/source-builder/sb/linux.py b/source-builder/sb/linux.py
index d89377b..d71ac39 100644
--- a/source-builder/sb/linux.py
+++ b/source-builder/sb/linux.py
@@ -76,20 +76,16 @@ def load():
         except:
             pass
 
+    distro = distro.lower()
+
     # Manage distro aliases
     if distro in ['centos']:
         distro = 'redhat'
     elif distro in ['fedora']:
         if distro_ver < 17:
             distro = 'redhat'
-    elif distro in ['centos', 'fedora']:
-        distro = 'redhat'
-    elif distro in ['Ubuntu', 'ubuntu', 'MX', 'LinuxMint', 'linuxmint']:
+    elif distro in ['ubuntu', 'mx', 'linuxmint']:
         distro = 'debian'
-    elif distro in ['Arch']:
-        distro = 'arch'
-    elif distro in ['SuSE']:
-        distro = 'suse'
 
     variations = {
         'debian' : { '__bzip2':        ('exe',     'required', '/bin/bzip2'),



More information about the vc mailing list