diff options
author | Eric Engestrom <eric@igalia.com> | 2023-12-01 16:30:56 +0000 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2023-12-02 11:48:35 +0000 |
commit | f548d84a352964dbd0b90c8493a5464981b71524 (patch) | |
tree | f6c8a940a3135555865bb0ee2c4e22da74b0b853 /bin | |
parent | 2a6d750a53ecec2882d77fc3250989815830c9bf (diff) |
bin/python-venv: fix venv folder check
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: 69ec13b303a8781148aa ("bin/python-venv: detect python version change")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26453>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/python-venv.sh | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/bin/python-venv.sh b/bin/python-venv.sh index b6cf7fd9f5b..b394bbcd061 100755 --- a/bin/python-venv.sh +++ b/bin/python-venv.sh @@ -9,19 +9,22 @@ readonly venv_dir readonly venv_req=$venv_dir/requirements.txt readonly venv_python_version=$venv_dir/python-version.txt -if [ -d "$venv_dir" ] && [ ! -r "$venv_python_version" ] +if [ -d "$venv_dir" ] then - echo "Python environment predates Python version checks." - echo "It might be invalid and needs to be regenerated." - rm -rf "$venv_dir" -elif ! cmp --quiet <(python --version) "$venv_python_version" -then - old=$(cat "$venv_python_version") - new=$(python --version) - echo "Python version has changed ($old -> $new)." - echo "Python environment needs to be regenerated." - unset old new - rm -rf "$venv_dir" + if [ ! -r "$venv_python_version" ] + then + echo "Python environment predates Python version checks." + echo "It might be invalid and needs to be regenerated." + rm -rf "$venv_dir" + elif ! cmp --quiet <(python --version) "$venv_python_version" + then + old=$(cat "$venv_python_version") + new=$(python --version) + echo "Python version has changed ($old -> $new)." + echo "Python environment needs to be regenerated." + unset old new + rm -rf "$venv_dir" + fi fi if ! [ -r "$venv_dir/bin/activate" ] |