diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | python/tidy.py | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index ca9075a48f0..1a8a8947843 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -136,6 +136,8 @@ class MachCommands(CommandBase): status = subprocess.call( make_cmd + ["-f", "openssl.makefile"], env=self.build_env()) + if status: + return status openssl_dir = path.join(self.android_support_dir(), "openssl-1.0.1k") env['OPENSSL_LIB_DIR'] = openssl_dir env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 5b3ad797c03..8047bf44179 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -168,7 +168,7 @@ class CommandBase(object): env["GONKDIR"] = self.config["gonk"]["b2g"] if "GONKDIR" not in env: # Things can get pretty opaque if this hasn't been set - print("Please set $GONKDIR in your environment or servobild file") + print("Please set $GONKDIR in your environment or .servobuild file") sys.exit(1) if self.config["gonk"]["product"]: env["GONK_PRODUCT"] = self.config["gonk"]["product"] diff --git a/python/tidy.py b/python/tidy.py index 07eebf80677..780cfca647e 100644 --- a/python/tidy.py +++ b/python/tidy.py @@ -72,12 +72,10 @@ def check_length(idx, line): yield (idx + 1, "(much) overlong line") def check_whatwg_url(idx, line): - matches = re.findall(r'whatwg.org/multipage.*#', line); - if matches: - for i, match in enumerate(matches): - parts = match.split('multipage') - if len(parts[1]) > 1 and parts[1][1] != '#': - yield (idx + 1, "URL should not point to specific WHATWG multipage page!") + match = re.search(r"https://html\.spec\.whatwg\.org/multipage/[\w-]+\.html#([\w\:-]+)", line) + if match is not None: + preferred_link = "https://html.spec.whatwg.org/multipage/#{}".format(match.group(1)) + yield (idx + 1, "link to WHATWG may break in the future, use this format instead: {}".format(preferred_link)) def check_whitespace(idx, line): if line[-1] == "\n": |