diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-05 01:11:33 +0530 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-01-18 03:04:22 +0000 |
commit | f7fb40564858bed0ed892599d928b16aaae8da6e (patch) | |
tree | f2f0f21e41e500f352b188e14f1e394b1b05f040 | |
parent | 7e0d8b821070216af7ce4ee921a5d505598d9ede (diff) |
cerbero: Fix support for Fedora 35
NAME in /etc/os-release is now Fedora Linux
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/779>
-rw-r--r-- | cerbero/utils/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py index 0b30b2cf..6685feb6 100644 --- a/cerbero/utils/__init__.py +++ b/cerbero/utils/__init__.py @@ -249,7 +249,7 @@ Terminating.''', file=sys.stderr) distro_version = "debian_{number:02d}_{name}".format(number=int(d[1]), name=d[2]) else: raise FatalError("Distribution '%s' not supported" % str(d)) - elif d[0] in ['RedHat', 'Fedora', 'CentOS', 'Red Hat Enterprise Linux Server', 'CentOS Linux']: + elif d[0] in ['RedHat', 'Fedora', 'Fedora Linux', 'CentOS', 'Red Hat Enterprise Linux Server', 'CentOS Linux']: distro = Distro.REDHAT if d[1] == '16': distro_version = DistroVersion.FEDORA_16 @@ -285,7 +285,7 @@ Terminating.''', file=sys.stderr) distro_version = DistroVersion.FEDORA_31 elif d[1] == '32': distro_version = DistroVersion.FEDORA_32 - elif d[0] == 'Fedora': + elif d[0].startswith('Fedora'): # str(int()) is for ensuring that the fedora version is # actually a number distro_version = 'fedora_' + str(int(d[1])) |