From 32e949ddef724ab0472c147d412345c11bdc7687 Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@inrae.fr>
Date: Fri, 30 Sep 2022 12:45:34 +0200
Subject: [PATCH] ENH: more permissive failsafe for git
---
decloud/core/system.py | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/decloud/core/system.py b/decloud/core/system.py
index 0b9f475..d43fb85 100644
--- a/decloud/core/system.py
+++ b/decloud/core/system.py
@@ -41,16 +41,13 @@ def get_commit_hash():
""" Return the git hash of the repository """
repo = git.Repo(os.path.dirname(os.path.realpath(__file__)), search_parent_directories=True)
- commit_hash = "nohash"
try:
- commit_hash = repo.head.object.hexsha[0:5]
- except (ValueError, TypeError) as e:
- print(f"Unable to get commit hash! {e}")
-
- try:
- commit_hash = repo.active_branch.name + "_" + commit_hash
- except (ValueError, TypeError) as e:
- print(f"Unable to get branch name! {e}")
+ commit_hash = repo.active_branch.name + "_" + repo.head.object.hexsha[0:5]
+ except (TypeError, ValueError, BrokenPipeError):
+ try:
+ commit_hash = 'DETACHED_' + repo.head.object.hexsha[0:5]
+ except (ValueError, BrokenPipeError):
+ commit_hash = 'DETACHED'
return commit_hash
--
GitLab