summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartłomiej Kurzeja <bartlomiej@kurzeja.it>2021-06-21 14:30:28 +0200
committerBartłomiej Kurzeja <bartlomiej@kurzeja.it>2021-06-21 14:30:28 +0200
commitc6fb832e10cb6e65b2afe536489eefac483a0259 (patch)
tree32248f5e3ac3b39a6376f18f485831f89167aef1
parent242857c1ef286ff2c59e11803a057b4cc0a5360f (diff)
Revert "utils: Support latest Debian release names"
This reverts commit 6e0e800395f997d837f8948b8ac844744fa3a49c. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/709>
-rw-r--r--cerbero/utils/__init__.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py
index 1fb923b8..f034af30 100644
--- a/cerbero/utils/__init__.py
+++ b/cerbero/utils/__init__.py
@@ -251,17 +251,17 @@ Terminating.''', file=sys.stderr)
distro_version = DistroVersion.UBUNTU_FOCAL
elif d[1].startswith('6.'):
distro_version = DistroVersion.DEBIAN_SQUEEZE
- elif d[1].startswith('7.') or d[1].startswith('wheezy') or distro_version == "wheezy":
+ elif d[1].startswith('7.') or d[1].startswith('wheezy'):
distro_version = DistroVersion.DEBIAN_WHEEZY
- elif d[1].startswith('8.') or d[1].startswith('jessie') or distro_version == "jessie":
+ elif d[1].startswith('8.') or d[1].startswith('jessie'):
distro_version = DistroVersion.DEBIAN_JESSIE
- elif d[1].startswith('9.') or d[1].startswith('stretch') or distro_version == "stretch":
+ elif d[1].startswith('9.') or d[1].startswith('stretch'):
distro_version = DistroVersion.DEBIAN_STRETCH
- elif d[1].startswith('10.') or d[1].startswith('buster') or distro_version == "buster":
+ elif d[1].startswith('10.') or d[1].startswith('buster'):
distro_version = DistroVersion.DEBIAN_BUSTER
- elif d[1].startswith('11.') or d[1].startswith('bullseye') or distro_version == "bullseye":
+ elif d[1].startswith('11.') or d[1].startswith('bullseye'):
distro_version = DistroVersion.DEBIAN_BULLSEYE
- elif d[1] == 'unstable' and distro_version == 'sid':
+ elif d[1] == 'unstable' and d[2] == 'sid':
distro_version = DistroVersion.DEBIAN_SID
else:
raise FatalError("Distribution '%s' not supported" % str(d))