aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-12-12 05:21:16 -0500
committerGitHub <noreply@github.com>2019-12-12 05:21:16 -0500
commit06e3d13795969be2d5c78123cbbcd5a5c9414495 (patch)
treeab21423f23f58d7694b897fc40c712d333e2e79e /python
parent82fd8d1daf0ac59dd6b846479eb5d36b123d2ce3 (diff)
parent47fab46ca3e1c5432c5e3c0de638b5bb8d104bbf (diff)
downloadservo-06e3d13795969be2d5c78123cbbcd5a5c9414495.tar.gz
servo-06e3d13795969be2d5c78123cbbcd5a5c9414495.zip
Auto merge of #25247 - pshaughn:clean_virtualenv2.7, r=jdm
mach clean now finds the right virtualenv to remove <!-- Please describe your changes on the following line: --> mach clean now knows about the https://github.com/servo/servo/commit/00cf7452ef2bcb272dafb09a711301a2ef280ae2 change and will remove _virtualenv2.7 appropriately --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix problems discussed today with SimonSapin in IRC <!-- Either: --> - [X] These changes do not require tests because the functionality being changed uninstalls some of the test framework <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'python')
-rw-r--r--python/servo/build_commands.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 1a2f4c420c6..4630c9a9dbf 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -756,7 +756,8 @@ class MachCommands(CommandBase):
def clean(self, manifest_path=None, params=[], verbose=False):
self.ensure_bootstrapped()
- virtualenv_path = path.join(self.get_top_dir(), 'python', '_virtualenv')
+ virtualenv_fname = '_virtualenv%d.%d' % (sys.version_info[0], sys.version_info[1])
+ virtualenv_path = path.join(self.get_top_dir(), 'python', virtualenv_fname)
if path.exists(virtualenv_path):
print('Removing virtualenv directory: %s' % virtualenv_path)
shutil.rmtree(virtualenv_path)