diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/mach_bootstrap.py | 24 | ||||
| -rw-r--r-- | python/servo/command_base.py | 3 | ||||
| -rw-r--r-- | python/servo/post_build_commands.py | 3 | ||||
| -rw-r--r-- | python/tidy/servo_tidy/tidy.py | 2 | ||||
| -rw-r--r-- | python/tox.ini | 3 |
5 files changed, 23 insertions, 12 deletions
diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py index 57e6472e5c8..a22d2aea9af 100644 --- a/python/mach_bootstrap.py +++ b/python/mach_bootstrap.py @@ -106,10 +106,14 @@ def _activate_virtualenv(topdir): if virtualenv is None: sys.exit("Python virtualenv is not installed. Please install it prior to running mach.") - try: - subprocess.check_call([virtualenv, "-p", python, virtualenv_path]) - except (subprocess.CalledProcessError, OSError): - sys.exit("Python virtualenv failed to execute properly.") + process = subprocess.Popen( + [virtualenv, "-p", python, virtualenv_path], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + process.wait() + if process.returncode: + sys.exit("Python virtualenv failed to execute properly: {}" + .format(process.communicate()[1])) execfile(activate_path, dict(__file__=quote(activate_path))) @@ -138,10 +142,14 @@ def _activate_virtualenv(topdir): if pip is None: sys.exit("Python pip is not installed. Please install it prior to running mach.") - try: - subprocess.check_call([pip, "install", "-q", "-r", req_path]) - except (subprocess.CalledProcessError, OSError): - sys.exit("Pip failed to execute properly.") + process = subprocess.Popen( + [pip, "install", "-q", "-r", req_path], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + process.wait() + if process.returncode: + sys.exit("Pip failed to execute properly: {}" + .format(process.communicate()[1])) open(marker_path, 'w').close() diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 1623c8fc41f..0b51bf93dc6 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -293,8 +293,7 @@ class CommandBase(object): if extra_path: env["PATH"] = "%s%s%s" % (os.pathsep.join(extra_path), os.pathsep, env["PATH"]) - if "CARGO_HOME" not in env: - env["CARGO_HOME"] = self.config["tools"]["cargo-home-dir"] + env["CARGO_HOME"] = self.config["tools"]["cargo-home-dir"] if "CARGO_TARGET_DIR" not in env: env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target") diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 7bbb8c03ed5..3170e07437a 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -118,9 +118,10 @@ class PostBuildCommands(CommandBase): rustCommand = 'rust-' + debugger try: subprocess.check_call([rustCommand, '--version'], env=env, stdout=open(os.devnull, 'w')) - command = rustCommand except (OSError, subprocess.CalledProcessError): pass + else: + command = rustCommand # Prepend the debugger args. args = ([command] + self.debuggerInfo.args + diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index c0bfce1a5f0..eb3aa579b66 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -231,7 +231,7 @@ def check_lock(file_name, contents): raise StopIteration # package names to be neglected (as named by cargo) - exceptions = ["bitflags", "xml-rs", "lazy_static"] + exceptions = ["bitflags", "lazy_static"] import toml content = toml.loads(contents) diff --git a/python/tox.ini b/python/tox.ini new file mode 100644 index 00000000000..e684cc63d8b --- /dev/null +++ b/python/tox.ini @@ -0,0 +1,3 @@ +[flake8] +filename = *.py +max-line-length = 120 |