Merge pull request mozilla#2527 from lissyx/pyenv-virtualenv-cache

Don't fail on existing pyenv virtualenv symlink
lissyx · Nov 13, 2019 · dab5183 · dab5183
2 parents f18643b + 024f8e4
commit dab5183
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
@@ -667,7 +667,18 @@ setup_pyenv_virtualenv()
     mkdir ${PYENV_ROOT}/versions/${version}/envs
     PATH=${PYENV_ROOT}/versions/${version}/tools:${PYENV_ROOT}/versions/${version}/tools/Scripts:$PATH virtualenv ${PYENV_ROOT}/versions/${version}/envs/${name}
   else
-    pyenv virtualenv ${version} ${name}
+    ls -hal "${PYENV_ROOT}/versions/"
+
+    # There could be a symlink when re-using cacche on macOS
+    # We don't care, let's just remove it
+    if [ -L "${PYENV_ROOT}/versions/${name}" ]; then
+      rm "${PYENV_ROOT}/versions/${name}"
+    fi
+
+    # Don't force-reinstall existing version
+    if [ ! -f "${PYENV_ROOT}/versions/${version}/envs/${name}/bin/activate" ]; then
+      pyenv virtualenv ${version} ${name}
+    fi
   fi
 }