servo: Merge #16389 - Allow bootstrapping on Debian (from aneeshusa:support-debian-for-mach-bootstrap); r=jdm

<!-- Please describe your changes on the following line: -->

This is needed for servo/saltfs#631, since the Travis builders are detected as `'debian'` for some reason.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because the test will be in saltfs

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 2e82d98afff696dfd574087a0806383a6abc4c78

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 86333237f56fdbd41bfb84a1605efb3fee06b215
This commit is contained in:
Aneesh Agrawal 2017-04-12 22:22:33 -05:00
Родитель aedebf3f44
Коммит abbe17a158
1 изменённых файлов: 7 добавлений и 1 удалений

Просмотреть файл

@ -270,7 +270,13 @@ def bootstrap(context, force=False):
bootstrapper = windows_msvc
elif "linux-gnu" in host_triple():
distro, version, _ = platform.linux_distribution()
if distro in ['CentOS', 'CentOS Linux', 'Fedora', 'Ubuntu']:
if distro.lower() in [
'centos',
'centos linux',
'debian',
'fedora',
'ubuntu',
]:
context.distro = distro
bootstrapper = salt