From fcc06b5a1696f3ac01f20ed2a1a84363f379a95c Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 3 Sep 2018 14:04:53 +0530 Subject: [PATCH] Better error reporting for missing gstreamer --- python/servo/command_base.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index cedfeb626f3..952e4d692c4 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -478,13 +478,22 @@ class CommandBase(object): return path.join(bin_folder, "servo{}".format(BIN_SUFFIX)) def needs_gstreamer_env(self, target): + if check_gstreamer_lib(): + return False gstpath = path.join(self.context.topdir, "support", "linux", "gstreamer", "gstreamer") - if sys.platform == "linux2" and path.isdir(gstpath): - if not check_gstreamer_lib(): - if "x86_64" not in (target or host_triple()): - raise Exception("We don't currently support using local gstreamer builds \ + if sys.platform == "linux2": + if "x86_64" not in (target or host_triple()): + raise Exception("We don't currently support using local gstreamer builds \ for non-x86_64, please file a bug") + if path.isdir(gstpath): return True + else: + raise Exception("Your system's gstreamer libraries are out of date \ + (we need at least 1.12). Please run ./mach bootstrap-gstreamer") + else: + raise Exception("Your system's gstreamer libraries are out of date \ + (we need at least 1.12). If you're unable to \ + install them, let us know by filing a bug!") return False def set_run_env(self):