mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
Auto merge of #21734 - Manishearth:bootstrap-retcode, r=jdm
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:
commit
3889041cc6
1 changed files with 9 additions and 1 deletions
|
@ -99,6 +99,12 @@ def gstreamer(context, force=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):
|
||||
# Please keep these in sync with the packages in README.md
|
||||
pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev',
|
||||
|
@ -146,6 +152,8 @@ def linux(context, force=False):
|
|||
if not installed_something:
|
||||
print("Dependencies were already installed!")
|
||||
|
||||
return 0
|
||||
|
||||
|
||||
def salt(context, force=False):
|
||||
# Ensure Salt dependencies are installed
|
||||
|
@ -329,7 +337,7 @@ def windows_msvc(context, force=False):
|
|||
|
||||
LINUX_SPECIFIC_BOOTSTRAPPERS = {
|
||||
"salt": salt,
|
||||
"gstreamer": gstreamer,
|
||||
"gstreamer": bootstrap_gstreamer,
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue