From 9f62818795d1c4c38458657814dd18512b5e55e6 Mon Sep 17 00:00:00 2001
From: Philip Guyton <philip@yewtreeapps.com>
Date: Thu, 25 Jan 2024 15:27:07 +0000
Subject: [PATCH] Failure to re-create venv - pre 5.0.3-0 updating to 5.0.6-0
 rpm #2788

## Includes
- Remove now redundant Py3.6 work-around re Poetry and LANG env var.
- Establish LANG from install.
- Record `env` & `poetry --version` in poetry-install.txt before
venv install.
- Add diagnostic `pipx list`.
- Alternate python version declaration in poetry install via pipx.
- Enable full `poetry install` debug logging.
- Unset pre 5.0.3-0 VIRTUAL_ENV environmental variable, redundant
when updating from 5.0.3-0 onwards.
---
 build.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index f3b855609..992d6fbe0 100644
--- a/build.sh
+++ b/build.sh
@@ -13,13 +13,27 @@ fi
 PATH="${PATH//'/root/.local/bin:'/''}" # null all legacy poetry paths
 # We are run, outside of development, only by RPM's %posttrans.
 # As such our .venv dir has already been removed in %post (update mode).
+echo "Unset VIRTUAL_ENV"
+# Redundant when updating from rockstor 5.0.3-0 onwards: src/rockstor/system/pkg_mgmt.py
+unset VIRTUAL_ENV
 PATH="${PATH//'/opt/rockstor/.venv/bin:'/''}" # null now removed .venv from path.
+
 echo "build.sh has PATH=$PATH"
+echo
+# Establish LANG from install.
+source /etc/locale.conf
+echo "Adopting installs' LANG=${LANG}"
+
 # Install Poetry via PIPX as a global app
 # https://peps.python.org/pep-0668/#guide-users-towards-virtual-environments
+# https://pipx.pypa.io/stable/installation/
 export PIPX_HOME=/opt/pipx  # virtual environment location, default ~/.local/pipx
 export PIPX_BIN_DIR=/usr/local/bin  # binary location for pipx-installed apps, default ~/.local/bin
-python3.11 -m pipx install poetry==1.7.1
+export PIPX_MAN_DIR=/usr/local/share/man  # manual page location for pipx-installed apps, default ~/.local/share/man
+# https://python-poetry.org/docs/#installing-with-pipx
+pipx ensurepath
+pipx install --python python3.11 poetry==1.7.1
+pipx list
 
 # Install project dependencies defined in cwd pyproject.toml using poetry.toml
 # specific configuration, i.e. virtualenv in cwd/.venv
@@ -27,12 +41,10 @@ python3.11 -m pipx install poetry==1.7.1
 # poetry env remove --all  # removes all venvs associated with a pyproject.toml
 # rm -rf ~/.cache/pypoetry/virtualenvs/*  # to delete default location venvs.
 # ** --no-ansi avoids special characters **
-# Resolve Python 3.6 Poetry issue re char \u2022: (bullet)
-# https://github.com/python-poetry/poetry/issues/3078
-export LANG=C.UTF-8
-export PYTHONIOENCODING=utf8
+env > poetry-install.txt
+poetry --version >> poetry-install.txt
 # /usr/local/bin/poetry -> /opt/pipx/venvs/poetry
-/usr/local/bin/poetry install --no-interaction --no-ansi > poetry-install.txt 2>&1
+poetry install -vvv --no-interaction --no-ansi >> poetry-install.txt 2>&1
 echo
 
 # Add js libs. See: https://github.com/rockstor/rockstor-jslibs