From 8d94585a87b17f645ff96f49edbea713fccdbbaf Mon Sep 17 00:00:00 2001
From: Douglas RAILLARD <douglas.raillard@arm.com>
Date: Mon, 14 Jan 2019 18:30:39 +0000
Subject: [PATCH] lisa_shell: Check PYTHONPATH

Warn if PYTHONPATH is not empty, since it can interfere with venv. In
the worst case, it can lead to using a wrong version of e.g. bart that
would be installed somewhere else, leading to strange failures in LISA.

Also remove PYTHONPATH from the banner since it is not part of the
normal setup anymore.
---
 shell/lisa_shell | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/shell/lisa_shell b/shell/lisa_shell
index 785ceee55..f283639ea 100755
--- a/shell/lisa_shell
+++ b/shell/lisa_shell
@@ -100,6 +100,11 @@ function lisa-venv-activate {
         if [[ ! -e "$LISA_VENV_PATH" ]]; then
             lisa-install || return 1
         fi
+
+        if [[ -n "$PYTHONPATH" ]]; then
+            echo "WARNING: Your PYTHONPATH is not empty, it may interfere with LISA's venv: $PYTHONPATH" >&2
+        fi
+
         echo "Activating LISA Python venv ($LISA_VENV_PATH) ..."
         VIRTUAL_ENV_DISABLE_PROMPT=1 source "$LISA_VENV_PATH/bin/activate"
     fi
@@ -310,8 +315,6 @@ function _lisa-jupyter-start {
     echo '  URL        : ' $URL
     echo '  Folder     : ' $PYDIR
     echo '  Logfile    : ' $LOGFILE
-    echo '  PYTHONPATH : '
-    echo -e "\t${PYTHONPATH//:/\\n\\t}"
     cd $PYDIR
     echo
     echo -n 'Notebook server task: '
@@ -432,10 +435,8 @@ cat <<EOF
 Welcome to the Linux Integrated System Analysis SHELL!
 
 version $(git rev-parse --short=11 HEAD)
-LISA_HOME  : $LISA_HOME
-PYTHONPATH :
+LISA_HOME: $LISA_HOME
 EOF
-echo -e "\t${PYTHONPATH//:/\\n\\t}"
 
 cat <<EOF
 
-- 
GitLab