venvlib: restrict VIRTUALENV_ALWAYS_COPY workaround to older versions
Upstream thinks this is fixed with 20.0+, so apply the workaround to
older versions only, and lets find out if they're right.
BUG=chromium:1092855
TEST=CQ passes
Change-Id: I97f614c8f2aea9c978e7eae1010343782d08a613
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra_virtualenv/+/2238089
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/venv/cros_venv/venvlib.py b/venv/cros_venv/venvlib.py
index 6328aca..702cc02 100644
--- a/venv/cros_venv/venvlib.py
+++ b/venv/cros_venv/venvlib.py
@@ -242,9 +242,10 @@
(ver, MIN_VER))
env = os.environ.copy()
- # TODO(crbug.com/808434): upstream virtualenv has a bug when this is
- # set. See also https://github.com/pypa/virtualenv/issues/565
- env.pop('VIRTUALENV_ALWAYS_COPY', None)
+ if ver < (20, 0):
+ # TODO(crbug.com/808434): upstream virtualenv has a bug when this is
+ # set. See also https://github.com/pypa/virtualenv/issues/565
+ env.pop('VIRTUALENV_ALWAYS_COPY', None)
command = [_VIRTUALENV_COMMAND, venvdir, '-p', sys.executable,
'--extra-search-dir', _PACKAGE_DIR, '--clear',