Detect slc9 arch on RHEL9 correctly

alibuild_helpers/utilities.py

@@ -148,9 +148,15 @@ def doDetectArch(hasOsRelease, osReleaseLines, platformTuple, platformSystem, pl
     return "osx_%s" % processor.replace("_", "-")
   distribution, version, flavour = platformTuple
   distribution = distribution.lower()
-  # If platform.dist does not return something sensible,
-  # let's try with /etc/os-release
-  if distribution not in ["ubuntu", "redhat", "centos", "almalinux", "rockylinux"] and hasOsRelease:
+
+  if distribution in ("redhat", "red hat enterprise linux", "centos", "almalinux", "rockylinux"):
+    distribution = "slc"
+  elif distribution == "ubuntu":
+    major, _, minor = version.partition(".")
+    version = major + minor
+  elif hasOsRelease:
+    # If platform.dist does not return something sensible,
+    # let's try with /etc/os-release
     for x in osReleaseLines:
       key, is_prop, val = x.partition("=")
       if not is_prop:
@@ -161,17 +167,12 @@ def doDetectArch(hasOsRelease, osReleaseLines, platformTuple, platformSystem, pl
       if key == "VERSION_ID":
         version = val
 
-  if distribution == "ubuntu":
-    major, _, minor = version.partition(".")
-    version = major + minor
-  elif distribution == "debian":
+  if distribution == "debian":
     # http://askubuntu.com/questions/445487/which-ubuntu-version-is-equivalent-to-debian-squeeze
     debian_ubuntu = {"7": "1204", "8": "1404", "9": "1604", "10": "1804", "11": "2004"}
     if version in debian_ubuntu:
       distribution = "ubuntu"
       version = debian_ubuntu[version]
-  elif distribution in ["redhat", "centos", "almalinux", "rockylinux"]:
-    distribution = "slc"
 
   processor = platformProcessor
   if not processor: