Merge pull request #3930 from boegel/etc_os_release

also take /etc/os-release into account in get_os_name and get_os_version

Author: SebastianAchilles

easybuild/tools/systemtools.py

@@ -116,6 +116,7 @@
 
 UNKNOWN = 'UNKNOWN'
 
+ETC_OS_RELEASE = '/etc/os-release'
 MAX_FREQ_FP = '/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq'
 PROC_CPUINFO_FP = '/proc/cpuinfo'
 PROC_MEMINFO_FP = '/proc/meminfo'
@@ -681,11 +682,21 @@ def get_os_name():
     if hasattr(platform, 'linux_distribution'):
         # platform.linux_distribution is more useful, but only available since Python 2.6
         # this allows to differentiate between Fedora, CentOS, RHEL and Scientific Linux (Rocks is just CentOS)
-        os_name = platform.linux_distribution()[0].strip().lower()
-    elif HAVE_DISTRO:
+        os_name = platform.linux_distribution()[0].strip()
+
+    # take into account that on some OSs, platform.distribution returns an empty string as OS name,
+    # for example on OpenSUSE Leap 15.2
+    if not os_name and HAVE_DISTRO:
         # distro package is the recommended alternative to platform.linux_distribution,
         # see https://pypi.org/project/distro
         os_name = distro.name()
+
+    if not os_name and os.path.exists(ETC_OS_RELEASE):
+        os_release_txt = read_file(ETC_OS_RELEASE)
+        name_regex = re.compile('^NAME="?(?P<name>[^"\n]+)"?$', re.M)
+        res = name_regex.search(os_release_txt)
+        if res:
+            os_name = res.group('name')
     else:
         # no easy way to determine name of Linux distribution
         os_name = None
@@ -699,19 +710,38 @@ def get_os_name():
     }
 
     if os_name:
-        return os_name_map.get(os_name, os_name)
+        return os_name_map.get(os_name.lower(), os_name)
     else:
         return UNKNOWN
 
 
 def get_os_version():
     """Determine system version."""
 
+    os_version = None
+
     # platform.dist was removed in Python 3.8
     if hasattr(platform, 'dist'):
         os_version = platform.dist()[1]
-    elif HAVE_DISTRO:
+
+    # take into account that on some OSs, platform.dist returns an empty string as OS version,
+    # for example on OpenSUSE Leap 15.2
+    if not os_version and HAVE_DISTRO:
         os_version = distro.version()
+
+    if not os_version and os.path.exists(ETC_OS_RELEASE):
+        os_release_txt = read_file(ETC_OS_RELEASE)
+        version_regex = re.compile('^VERSION="?(?P<version>[^"\n]+)"?$', re.M)
+        res = version_regex.search(os_release_txt)
+        if res:
+            os_version = res.group('version')
+        else:
+            # VERSION may not always be defined (for example on Gentoo),
+            # fall back to VERSION_ID in that case
+            version_regex = re.compile('^VERSION_ID="?(?P<version>[^"\n]+)"?$', re.M)
+            res = version_regex.search(os_release_txt)
+            if res:
+                os_version = res.group('version')
     else:
         os_version = None