diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-08 15:28:03 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-08 15:28:03 -0700 |
| commit | 35c13f07bfd6a8973399e75404fa61a6d9aeda00 (patch) | |
| tree | ab032a1f1e35056747af1ec099c7479fed907d58 | |
| parent | 40c706b42d9d29ef58913f22da49159796e1b81b (diff) | |
| parent | f716e8bbf1f20e280d5f973664fd3b4fc91686de (diff) | |
| download | servo-35c13f07bfd6a8973399e75404fa61a6d9aeda00.tar.gz servo-35c13f07bfd6a8973399e75404fa61a6d9aeda00.zip | |
auto merge of #4286 : andreastt/servo/ato/concat_error_on_system_rust, r=metajack
Since default argument to params is None, concatenating it with a
list will raise an error. This behaviour prevents `./mach rustc`
to be called when system-rust is defined in .servobuild.
Currently it will only work when followed by an argument, i.e.
`./mach rustc -arg`.
Testing this patch: `./mach rustc` should not raise an error.
| -rw-r--r-- | python/servo/devenv_commands.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index e031a957935..95b9f6eb561 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -48,6 +48,8 @@ class MachCommands(CommandBase): 'params', default=None, nargs='...', help="Command-line arguments to be passed through to rustc") def rustc(self, params): + if params is None: + params = [] return subprocess.call(["rustc"] + params, env=self.build_env()) @Command('rust-root', |