fixes ratt-ru/radiopadre#112 some more

ratt-ru · Nov 17, 2021 · d1b3fc8 · d1b3fc8
1 parent 8655785
commit d1b3fc8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/iglesia/utils.py b/iglesia/utils.py
@@ -34,10 +34,13 @@ def bye(x, code=1):
     message(x, level=logging.ERROR)
     sys.exit(code)
 
-def shell(cmd, ignore_fail=False):
+def shell(cmd, ignore_fail=False, env=None):
     """Runs shell command. If ignore_fail is set, returns None on failure"""
+    if env is not None:
+        env = dict(**env)
+        env.update(os.environ)
     try:
-       return subprocess.check_call(cmd, shell=True)
+       return subprocess.check_call(cmd, shell=True, env=env)
     except subprocess.CalledProcessError as exc:
         if ignore_fail:
             return None

diff --git a/radiopadre_client/backends/venv.py b/radiopadre_client/backends/venv.py
@@ -120,9 +120,14 @@ def update_installation():
         else:
             bye("no radiopadre installation method specified (see --server-install options)")
 
+        if config.VENV_IGNORE_JS9:
+            env = dict(RADIOPADRE_JS9_IGNORE_ERRORS=1)
+        else:
+            env = None
+
         cmd = f"{pip_install} -U {install}"
         message(f"Running {cmd}")
-        shell(cmd)
+        shell(cmd, env=env)
 
     # if not config.INSIDE_CONTAINER_PORTS:
     #     message(f"  Radiopadre has been installed from {config.SERVER_INSTALL_PATH}")

diff --git a/radiopadre_client/remote.py b/radiopadre_client/remote.py
@@ -223,10 +223,11 @@ def check_remote_command(command):
         if not check_remote_file(f"{config.RADIOPADRE_VENV}/bin/activate", "-f"):
             message(f"Creating virtualenv {remote_venv}")
             ssh_remote_v(f"virtualenv -p python3 {config.RADIOPADRE_VENV}")
+            extras = "pip setuptools"
             if config.VENV_EXTRAS:
-                extras = " ".join(config.VENV_EXTRAS.split(","))
-                message(f"Installing specified extras: {extras}")
-                ssh_remote_v(f"source {config.RADIOPADRE_VENV}/bin/activate && {pip_install} {extras}")
+                extras += " ".join(config.VENV_EXTRAS.split(","))
+            message(f"Installing {extras}")
+            ssh_remote_v(f"source {config.RADIOPADRE_VENV}/bin/activate && {pip_install} -U {extras}")
         else:
             message(f"Installing into existing virtualenv {remote_venv}")