diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-09-25 21:00:26 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-09-26 08:18:58 +0200 |
| commit | deeb79669f2bd3829cca745f2d514205a4d61307 (patch) | |
| tree | e9733234b5b998e45bfb3b1781045a218ee1287c /python/servo/command_base.py | |
| parent | 4e85f9c186a4cd1e23ba5cbe0c019b026d952ce1 (diff) | |
| download | servo-deeb79669f2bd3829cca745f2d514205a4d61307.tar.gz servo-deeb79669f2bd3829cca745f2d514205a4d61307.zip | |
Only add --manifest-path if not already present
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 85ec8435834..b6faa53a5e1 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -670,11 +670,14 @@ install them, let us know by filing a bug!") def ports_servo_crate(self): return path.join(self.context.topdir, "ports", "servo") - def manifest_path(self, android=False, libsimpleservo=False): - if libsimpleservo or android: - return self.ports_libsimpleservo_manifest() - else: - return self.ports_servo_manifest() + def add_manifest_path(self, args, android=False, libsimpleservo=False): + if "--manifest-path" not in args: + if libsimpleservo or android: + manifest = self.ports_libsimpleservo_manifest() + else: + manifest = self.ports_servo_manifest() + args.append("--manifest-path") + args.append(manifest) def ports_servo_manifest(self): return path.join(self.context.topdir, "ports", "servo", "Cargo.toml") |