From e06e9423abd63a18dd412d1f8672a9122906f267 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Fri, 16 Jun 2023 15:36:46 +0200
Subject: [PATCH] fix script hash not found when calling script as installed
package
---
src/mpsd_software_manager/mpsd_software.py | 36 ++++++++++++----------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index bf408b1..1d9cb42 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -599,24 +599,28 @@ def record_script_execution_summary(
cmd_line = " ".join(sys.argv)
# script branch and commit hash
with os_chdir(root_dir):
- script_branch = (
- run(
- ["git", "rev-parse", "--abbrev-ref", "HEAD"],
- stdout=subprocess.PIPE,
- check=True,
+ try:
+ script_branch = (
+ run(
+ ["git", "rev-parse", "--abbrev-ref", "HEAD"],
+ stdout=subprocess.PIPE,
+ check=True,
+ )
+ .stdout.decode()
+ .strip()
)
- .stdout.decode()
- .strip()
- )
- script_commit_hash = (
- run(
- ["git", "rev-parse", "--short", "HEAD"],
- stdout=subprocess.PIPE,
- check=True,
+ script_commit_hash = (
+ run(
+ ["git", "rev-parse", "--short", "HEAD"],
+ stdout=subprocess.PIPE,
+ check=True,
+ )
+ .stdout.decode()
+ .strip()
)
- .stdout.decode()
- .strip()
- )
+ except subprocess.CalledProcessError:
+ script_branch = "unknown"
+ script_commit_hash = "unknown"
# spack-environments branch and commit hash from kwargs
spe_branch = kwargs.get("spe_branch", None)
spe_commit_hash = kwargs.get("spe_commit_hash", None)
--
GitLab