aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/bootstrap.py
diff options
context:
space:
mode:
authorMarcin Wiącek <marcin@mwiacek.com>2019-05-06 20:21:12 +0200
committerMarcin Wiącek <marcin@mwiacek.com>2019-05-06 20:21:12 +0200
commitfcbba1df6dba1f6d3fd4b250a398ee17b23c29d7 (patch)
treee954f6607995f234231e0fb058d5e5004b300fd5 /python/servo/bootstrap.py
parentd077fb7244646d486930cc3d702cb440ddd648f1 (diff)
downloadservo-fcbba1df6dba1f6d3fd4b250a398ee17b23c29d7.tar.gz
servo-fcbba1df6dba1f6d3fd4b250a398ee17b23c29d7.zip
Improvement inside bootstrap.py after review
Diffstat (limited to 'python/servo/bootstrap.py')
-rw-r--r--python/servo/bootstrap.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py
index 9e5fcbc1440..0b5da09501d 100644
--- a/python/servo/bootstrap.py
+++ b/python/servo/bootstrap.py
@@ -124,7 +124,7 @@ def linux(context, force=False):
'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel',
'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213']
if context.distro == "Ubuntu":
- if context.distro_version == "17.04" or context.distro_version == "19.04":
+ if context.distro_version in ["17.04", "19.04"]:
pkgs_apt += ["libssl-dev"]
elif int(context.distro_version.split(".")[0]) < 17:
pkgs_apt += ["libssl-dev"]
@@ -386,11 +386,8 @@ def get_linux_distribution():
raise Exception('unsupported version of %s: %s' % (distro, version))
distro, version = 'Ubuntu', base_version
elif distro.lower() == 'ubuntu':
- if version == '19.04':
- base_version = '19.04'
- else:
+ if version > '19.04':
raise Exception('unsupported version of %s: %s' % (distro, version))
- distro, version = 'Ubuntu', base_version
# Fixme: we should allow checked/supported versions only
elif distro.lower() not in [
'centos',