diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-05 08:36:53 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-05 08:36:53 -0700 |
| commit | 3639c4e9818c5421659827b1da1844a9bbb792be (patch) | |
| tree | cdda313137920ce12a5827021eb0b2054500a3ac /python | |
| parent | ca876edc051c9b105747252155d0f11c31189646 (diff) | |
| parent | 9b1fd5a05f481ab87c4f8ad010168ec836cc3c5a (diff) | |
| download | servo-3639c4e9818c5421659827b1da1844a9bbb792be.tar.gz servo-3639c4e9818c5421659827b1da1844a9bbb792be.zip | |
auto merge of #4549 : laumann/servo/master, r=jdm
When invoking `./mach cargo` the following error appeared
```
Error running mach:
['cargo']
The error occurred in the implementation of the invoked mach command.
This should never occur and is likely a bug in the implementation of that
command. Consider filing a bug for this issue.
If filing a bug, please include the full output of mach, including this error
message.
The details of the failure are as follows:
TypeError: can only concatenate list (not "NoneType") to list
File "/home/tj/servo/python/servo/devenv_commands.py", line 24, in cargo
return subprocess.call(["cargo"] + params,
```
it seems to be that all that's missing is checking whether params is None or not.
Diffstat (limited to 'python')
| -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 30c8a440750..76f4a5e0bd3 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -21,6 +21,8 @@ class MachCommands(CommandBase): 'params', default=None, nargs='...', help="Command-line arguments to be passed through to Cargo") def cargo(self, params): + if not params: + params = [] return subprocess.call(["cargo"] + params, env=self.build_env()) |