aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/devenv_commands.py
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2016-07-04 10:29:30 -0400
committerJosh Matthews <josh@joshmatthews.net>2016-10-06 07:45:43 -0400
commit906b7b33efc788d169a4d746b8a2a90c136d9b73 (patch)
tree56df39621ad3792c3ab58d88374e655609121c81 /python/servo/devenv_commands.py
parent6bd898626fa65ad1382e101ed9af8a5fcfde19e2 (diff)
downloadservo-906b7b33efc788d169a4d746b8a2a90c136d9b73.tar.gz
servo-906b7b33efc788d169a4d746b8a2a90c136d9b73.zip
Rename mach command to upgrade wptrunner and make it work more than once.
Diffstat (limited to 'python/servo/devenv_commands.py')
-rw-r--r--python/servo/devenv_commands.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py
index 5a41b8b1b37..c99012a9a41 100644
--- a/python/servo/devenv_commands.py
+++ b/python/servo/devenv_commands.py
@@ -170,7 +170,7 @@ class MachCommands(CommandBase):
print(cargo_path)
call(["cargo", "fetch"], env=self.build_env())
- @Command('wpt-upgrade',
+ @Command('wptrunner-upgrade',
description='upgrade wptrunner.',
category='devenv')
def upgrade_wpt_runner(self):
@@ -178,6 +178,8 @@ class MachCommands(CommandBase):
code = call(["git", "init"], env=self.build_env())
if code:
return code
+ # No need to report an error if this fails, as it will for the first use
+ call(["git", "remote", "rm", "upstream"], env=self.build_env())
code = call(
["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=self.build_env())
if code: