From d6a68cc5b65b7c49db7b63e7a772d355f1eeb18b Mon Sep 17 00:00:00 2001 From: anonymous <anonymous> Date: Thu, 6 Jun 2019 16:10:26 +0200 Subject: [PATCH] change git call for version --- ckanext/odsh/helpers.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ckanext/odsh/helpers.py b/ckanext/odsh/helpers.py index a4881662..b629543d 100644 --- a/ckanext/odsh/helpers.py +++ b/ckanext/odsh/helpers.py @@ -229,10 +229,15 @@ def odsh_public_resource_url(res): def odsh_get_version_id(): try: - # return subprocess.check_output(["git", "rev-parse", "HEAD"]).strip() - return config.get('ckanext.odsh.version', 'unknown') + home = config.get('ckanext.odsh.home', None) + if home: + if home[-1] == '/': + home = home[:-1] + home += '/.git' + return subprocess.check_output(["git", "--git-dir", home, "rev-parse", "HEAD"]).strip() except: return 'unknown' + return 'unknown' def odsh_show_testbanner(): return config.get('ckanext.odsh.showtestbanner', 'False') == 'True' -- GitLab