From d135d5bb1248d3c4a359bfe4e2ef789637eac9e6 Mon Sep 17 00:00:00 2001
From: Hans Fangohr <fangohr@users.noreply.github.com>
Date: Sat, 10 Jun 2023 23:09:49 +0200
Subject: [PATCH] prepare: update spack-environments repo if it exists already

addresses issue 10 (
https://gitlab.gwdg.de/mpsd-cs/mpsd-software-environments/-/issues/10)
---
 mpsd-software-environment.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index 3fccf77..a5809bb 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -736,10 +736,8 @@ def prepare_environment(mpsd_release: str, root_dir: Path) -> List[str]:
     release_base_dir.mkdir(parents=True, exist_ok=True)
     repo_path = release_base_dir / "spack-environments"
     if repo_path.exists():
-        logging.debug(f"directory {repo_path} exists already, not touching")
-        logging.debug(
-            "XXX TODO: should we run a git pull here to get the latest version? XXX"
-        )
+        logging.debug(f"directory {repo_path} exists already, will update")
+        run(["git", "pull", "-v"], capture_output=True)
     else:
         repo_url = config_vars["spack_environments_repo"]
         logging.info(f"cloning repository {repo_path} from {repo_url}")
-- 
GitLab