OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bin/python-venv: fix venv folder check

Browse Source 
My last refactor before merging !26354 was incorrect and broke the
script when use for the first time (or after deleting the venv folder).

Fixes: 69ec13b303 ("bin/python-venv: detect python version change")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26453>
This commit is contained in:
Eric Engestrom
2023-12-01 16:30:56 +00:00
committed by Marge Bot
parent 2a6d750a53
commit f548d84a35
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bin/python-venv.sh
View File

@@ -9,19 +9,22 @@ readonly venv_dir
readonly venv_req=$venv_dir/requirements.txt readonly venv_req=$venv_dir/requirements.txt
readonly venv_python_version=$venv_dir/python-version.txt readonly venv_python_version=$venv_dir/python-version.txt
if [ -d "$venv_dir" ] && [ ! -r "$venv_python_version" ] if [ -d "$venv_dir" ]
then then
echo "Python environment predates Python version checks." if [ ! -r "$venv_python_version" ]
echo "It might be invalid and needs to be regenerated." then
rm -rf "$venv_dir" echo "Python environment predates Python version checks."
elif ! cmp --quiet <(python --version) "$venv_python_version" echo "It might be invalid and needs to be regenerated."
then rm -rf "$venv_dir"
old=$(cat "$venv_python_version") elif ! cmp --quiet <(python --version) "$venv_python_version"
new=$(python --version) then
echo "Python version has changed ($old -> $new)." old=$(cat "$venv_python_version")
echo "Python environment needs to be regenerated." new=$(python --version)
unset old new echo "Python version has changed ($old -> $new)."
rm -rf "$venv_dir" echo "Python environment needs to be regenerated."
unset old new
rm -rf "$venv_dir"
fi
fi fi
if ! [ -r "$venv_dir/bin/activate" ] if ! [ -r "$venv_dir/bin/activate" ]