diff options
| author | Veronika Horáčků <paricbat@email.cz> | 2023-04-30 10:29:48 +0200 |
|---|---|---|
| committer | Veronika Horáčků <paricbat@email.cz> | 2023-04-30 10:29:48 +0200 |
| commit | 7837310e4ee3a464bb77c171dcbb9b07836991cb (patch) | |
| tree | 0027e03683469e5f7932a7a2ebb1faa5410b06ee /python/servo/bootstrap.py | |
| parent | 4339b3bab494e477b502f82137bd360a963ec2be (diff) | |
| download | servo-7837310e4ee3a464bb77c171dcbb9b07836991cb.tar.gz servo-7837310e4ee3a464bb77c171dcbb9b07836991cb.zip | |
Fix installing dependencies on Fedora and remove usage of `distro.linux_distribution()`
`distro.linux_distribution()` is a deprecated function in the distro module.
Signed-off-by: Veronika Horáčků <paricbat@email.cz>
Diffstat (limited to 'python/servo/bootstrap.py')
| -rw-r--r-- | python/servo/bootstrap.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index acf7c78acbb..3e1ec06f53e 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -39,7 +39,7 @@ def install_linux_deps(context, pkgs_ubuntu, pkgs_fedora, pkgs_void, force): pkgs = pkgs_ubuntu if subprocess.call(['dpkg', '-s'] + pkgs, stdout=PIPE, stderr=PIPE) != 0: install = True - elif context.distro in ['CentOS', 'CentOS Linux', 'Fedora']: + elif context.distro in ['CentOS', 'CentOS Linux', 'Fedora', 'Fedora Linux']: installed_pkgs = str(subprocess.check_output(['rpm', '-qa'])).replace('\n', '|') pkgs = pkgs_fedora for p in pkgs: @@ -196,9 +196,8 @@ LINUX_SPECIFIC_BOOTSTRAPPERS = { def get_linux_distribution(): - distrib, version, _ = distro.linux_distribution() - distrib = six.ensure_str(distrib) - version = six.ensure_str(version) + distrib = six.ensure_str(distro.name()) + version = six.ensure_str(distro.version()) if distrib in ['LinuxMint', 'Linux Mint', 'KDE neon']: if '.' in version: |