From aa5e5596c02469520a8c526745fea487f88b08f1 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 1 Jul 2019 16:16:08 +0200 Subject: [PATCH] `./mach clean`: cwd is unnecessary when `--manifest-path` is used --- python/servo/build_commands.py | 7 ++----- python/servo/command_base.py | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 997b0f319de4..6dd5a608de94 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -712,14 +712,11 @@ def clean(self, manifest_path=None, params=[], verbose=False): print('Removing virtualenv directory: %s' % virtualenv_path) shutil.rmtree(virtualenv_path) - opts = [] - if manifest_path: - opts += ["--manifest-path", manifest_path] + opts = ["--manifest-path", manifest_path or self.ports_glutin_manifest()] if verbose: opts += ["-v"] opts += params - return check_call(["cargo", "clean"] + opts, - env=self.build_env(), cwd=self.ports_glutin_crate(), verbose=verbose) + return check_call(["cargo", "clean"] + opts, env=self.build_env(), verbose=verbose) def package_gstreamer_dlls(servo_exe_dir, target): diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 0b7ed2cf50b0..e05d37283ccf 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -731,9 +731,6 @@ def package_dir(package): return env - def ports_glutin_crate(self): - return path.join(self.context.topdir, "ports", "glutin") - def add_manifest_path(self, args, android=False, libsimpleservo=False): if "--manifest-path" not in args: if libsimpleservo or android: