Convert to a package

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)
@@ -1189,8 +1193,8 @@ def main():
     # Carry out the action
     args = parser.parse_args()
 
-    # target dir is the place where this script exists. the
-    root_dir = Path(os.path.dirname(os.path.realpath(__file__)))
+    # root dir is the place where this script is called from
+    root_dir = Path(os.getcwd())
 
     set_up_logging(
         args.loglevel,