update prepare env to include checks to update the branch

install-mpsd-software-environment.py

@@ -66,49 +66,47 @@ def setup_log_cmd(shared_var, msg=None):
                 f"Spack environments branch: {shared_var['spe_branch']} (commit hash: {shared_var['spe_commit_hash']})\n"
             )
 
-def prepare_environment(mpsd_release, toolchain_base_dir):
+def prepare_environment(mpsd_release, script_dir):
 
-    if not os.path.exists(toolchain_base_dir):
-        os.makedirs(toolchain_base_dir)
+    release_base_dir = os.path.join(script_dir, mpsd_release)
+    if not os.path.exists(release_base_dir):
+        os.makedirs(release_base_dir)
     else:
-        if not skip_dir_check:
-            raise ValueError(
-                f"Error: Target directory {toolchain_base_dir} already exists. \n\
-                Please remove it and try again."
-            )
-    with os_chdir(toolchain_base_dir):
-        subprocess.run(
-            [
-                "git",
-                "clone",
-                config_vars['spack_environments_repo'],
-            ]
-        )
-        with os_chdir("spack-environments"):
+        # Warn that the target directory already exists.
+        print(">Target directory already exists. Continuing...")
+    with os_chdir(release_base_dir):
+        # Clone the spack-environments repo if it doesn't exist
+        if not os.path.exists("spack-environments"):
+
             subprocess.run(
                 [
                     "git",
-                    "checkout",
-                    mpsd_release,
+                    "clone",
+                    config_vars['spack_environments_repo'],
                 ]
             )
+        with os_chdir("spack-environments"):
+        # Git fetch and checkout the release branch and git pull to be sure that the resulting repo is up to date
+            subprocess.run(["git", "fetch", "--all"])
+            subprocess.run(["git", "checkout", mpsd_release])
+            subprocess.run(["git", "pull"])
 
             # Get the branch and commit hash of the spack-environments repo and store them in shared_var
-            shared_var['spe_commit_hash'] = (
+            spe_commit_hash = (
                 subprocess.run(
                     ["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE
                 )
                 .stdout.decode()
                 .strip()
             )
-            shared_var['spe_branch'] = (
+            spe_branch = (
                 subprocess.run(
                     ["git", "rev-parse", "--abbrev-ref", "HEAD"], stdout=subprocess.PIPE
                 )
                 .stdout.decode()
                 .strip()
             )
-            shared_var['available_toolchains'] = os.listdir("toolchains")
+            available_toolchains = os.listdir("toolchains")
     setup_log_cmd(shared_var)
     return shared_var