Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21734 - Manishearth:bootstrap-retcode, r=jdm

Browse source 
Return appropriate code from bootstrap_gstreamer

Otherwise it exits with 1

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21734)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-09-18 20:18:06 -04:00 • committed by GitHub
commit 3889041cc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/bootstrap.py
View file

@ -99,6 +99,12 @@ def gstreamer(context, force=False):
return False return False
def bootstrap_gstreamer(context, force=False):
if not gstreamer(context, force):
print("gstreamer is already set up")
return 0
def linux(context, force=False): def linux(context, force=False):
# Please keep these in sync with the packages in README.md # Please keep these in sync with the packages in README.md
pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev', pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev',
@ -146,6 +152,8 @@ def linux(context, force=False):
if not installed_something: if not installed_something:
print("Dependencies were already installed!") print("Dependencies were already installed!")
return 0
def salt(context, force=False): def salt(context, force=False):
# Ensure Salt dependencies are installed # Ensure Salt dependencies are installed
@ -329,7 +337,7 @@ def windows_msvc(context, force=False):
LINUX_SPECIFIC_BOOTSTRAPPERS = { LINUX_SPECIFIC_BOOTSTRAPPERS = {
"salt": salt, "salt": salt,
"gstreamer": gstreamer, "gstreamer": bootstrap_gstreamer,
} }