osmith submitted this change.

View Change

pyhss: adjust to debian packaging changes

The Osmocom OBS is now building pyhss directly from upstream. Debian
packaging has been reworked there to use the --builtin-venv option of
dh_virtualenv:
https://github.com/nickvsnetworking/pyhss/commit/747be66b19dd40fc4bc9b060fe436f8d8f3a1e3d

This had the side-effect that we can't source
/opt/venvs/pyhss/bin/activate anymore after the build to get the correct
PATH of the venv:

$ . /opt/venvs/pyhss/bin/activate
(pyhss) # echo $PATH
/usr/src/packages/BUILD/debian/pyhss/opt/venvs/pyhss/bin:…

Set the proper PATH directly instead of going through this script.

Change-Id: I094334e4879180adaa7825fe777b342f4db6ce73
---
M hlr/pyhss/run_in_venv.sh
M hss/pyhss/run_in_venv.sh
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hlr/pyhss/run_in_venv.sh b/hlr/pyhss/run_in_venv.sh
index a145a7d..571c1d8 100755
--- a/hlr/pyhss/run_in_venv.sh
+++ b/hlr/pyhss/run_in_venv.sh
@@ -3,7 +3,7 @@
 
 if [ "$TESTENV_INSTALL_DIR" = "/" ]; then
 	# Installed via debian package
-	. /opt/venvs/pyhss/bin/activate
+	export PATH=/opt/venvs/pyhss/bin:"$PATH"
 else
 	# Built with osmo-dev
 	. "$TESTENV_INSTALL_DIR"/venv/bin/activate
diff --git a/hss/pyhss/run_in_venv.sh b/hss/pyhss/run_in_venv.sh
index a145a7d..571c1d8 100755
--- a/hss/pyhss/run_in_venv.sh
+++ b/hss/pyhss/run_in_venv.sh
@@ -3,7 +3,7 @@
 
 if [ "$TESTENV_INSTALL_DIR" = "/" ]; then
 	# Installed via debian package
-	. /opt/venvs/pyhss/bin/activate
+	export PATH=/opt/venvs/pyhss/bin:"$PATH"
 else
 	# Built with osmo-dev
 	. "$TESTENV_INSTALL_DIR"/venv/bin/activate

To view, visit change 43263. To unsubscribe, or for help writing mail filters, visit settings.