aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2020-03-31 23:34:52 -0400
committerGitHub <noreply@github.com>2020-03-31 23:34:52 -0400
commitef2b9863d158d79edf277b3681468e85acca593f (patch)
tree8252f3f00312858ce231266aa64ef6ba902dbc24
parent2c0bbcf2aa6e9daef8815992bfaea5e2b83a99e9 (diff)
parent16bb61bd5469e429638c5c6b05e650f77de65faf (diff)
downloadservo-ef2b9863d158d79edf277b3681468e85acca593f.tar.gz
servo-ef2b9863d158d79edf277b3681468e85acca593f.zip
Auto merge of #26081 - dylan-lom:fix-bootstrap-debian, r=jdm
Add support for Debian in mach bootstrap <!-- Please describe your changes on the following line: --> Run apt-get commands (as written for Ubuntu), when `context.distro` is 'Debian GNU/Linux'. This makes `./mach bootstrap` install dependencies on Debian. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #26080 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ No test is included, I'm unsure how I would add one, since the changes are distro-dependant. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
-rw-r--r--python/servo/bootstrap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py
index 9291ce87e3f..fa8fa7488ed 100644
--- a/python/servo/bootstrap.py
+++ b/python/servo/bootstrap.py
@@ -64,7 +64,7 @@ def run_as_root(command, force=False):
def install_linux_deps(context, pkgs_ubuntu, pkgs_fedora, force):
install = False
pkgs = []
- if context.distro == 'Ubuntu':
+ if context.distro in ['Ubuntu', 'Debian GNU/Linux']:
command = ['apt-get', 'install']
pkgs = pkgs_ubuntu
if subprocess.call(['dpkg', '-s'] + pkgs, stdout=PIPE, stderr=PIPE) != 0: