]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
bs don't remove venv-generated venv
authorZack Cerza <zack@cerza.org>
Thu, 28 Apr 2022 17:23:44 +0000 (11:23 -0600)
committerZack Cerza <zack@cerza.org>
Thu, 28 Apr 2022 21:48:41 +0000 (15:48 -0600)
bootstrap

index 997882df4bd2aa870e8371fb96db5cba1d0e2101..5b92641629d5487d5c98354b11c9e5e7f64ea92f 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -136,7 +136,7 @@ Darwin)
 esac
 
 # Forcibly remove old virtualenvs which used system site-packages
-if [ -e ./$VENV ]  && [ ! -e ./$VENV/lib/python*/no-global-site-packages.txt ]; then
+if [ -e ./$VENV ]  && [ ! -e ./$VENV/pyvenv.cfg ] && [ ! -e ./$VENV/lib/python*/no-global-site-packages.txt ]; then
     echo "Removing old virtualenv because it uses system site-packages"
     rm -rf ./$VENV
 fi