diff options
| author | Prabhjyot Singh Sodhi <prabhjyotsingh95@gmail.com> | 2015-02-20 20:39:31 +0530 |
|---|---|---|
| committer | Prabhjyot Singh Sodhi <prabhjyotsingh95@gmail.com> | 2015-02-21 03:18:42 +0530 |
| commit | a0a513006145833212c2c3ab83311e21f5ec012b (patch) | |
| tree | 87431dcb1aac6136c88950727f710ae142b4b13a /python/servo/devenv_commands.py | |
| parent | 276f74b1ddec9dfa4cb053eb0802f95bd5ed6b66 (diff) | |
| download | servo-a0a513006145833212c2c3ab83311e21f5ec012b.tar.gz servo-a0a513006145833212c2c3ab83311e21f5ec012b.zip | |
./mach cargo now cd's to servo dir if in root
Fixes #4976
Diffstat (limited to 'python/servo/devenv_commands.py')
| -rw-r--r-- | python/servo/devenv_commands.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index 76f4a5e0bd3..cab3f7ba81f 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -1,5 +1,5 @@ from __future__ import print_function, unicode_literals -from os import path +from os import path, getcwd import subprocess @@ -23,7 +23,12 @@ class MachCommands(CommandBase): def cargo(self, params): if not params: params = [] - return subprocess.call(["cargo"] + params, + + if self.context.topdir == getcwd(): + with cd(path.join('components', 'servo')): + return subprocess.call(["cargo"] + params, + env=self.build_env()) + return subprocess.call(['cargo'] + params, env=self.build_env()) @Command('update-cargo', |