diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-09-18 20:18:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 20:18:06 -0400 |
| commit | 3889041cc657940b9a60d16987a4746ed7a860a3 (patch) | |
| tree | 64b7109b469221e066ad10c6e37ccee250a653db | |
| parent | a02c43dc67d01c92d184b6a01b4011088b1940c0 (diff) | |
| parent | df5c31bada1ce9e2b3320336315f252042b59428 (diff) | |
| download | servo-3889041cc657940b9a60d16987a4746ed7a860a3.tar.gz servo-3889041cc657940b9a60d16987a4746ed7a860a3.zip | |
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 -->
| -rw-r--r-- | python/servo/bootstrap.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 0e128d2826e..262507b79e5 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -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, } |