From 09b84c4c2ab1abddc3f06f98db3170eff6a8edd1 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 20 Jan 2022 12:48:53 +0100 Subject: 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(-) (limited to 'source-builder') 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'), -- cgit v1.2.3