From: Paul Brossier <piem@piem.org>
Date: Thu, 23 Mar 2017 18:45:41 +0000 (+0100)
Subject: this_version.py: show status if tree is not clean
X-Git-Tag: 0.4.5~45^2~2
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=c2036016cf3c2e3f21376ef39f4fd586b6e91a77;p=aubio.git

this_version.py: show status if tree is not clean
---

diff --git a/this_version.py b/this_version.py
index 69d2f567..7674ef74 100644
--- a/this_version.py
+++ b/this_version.py
@@ -87,8 +87,15 @@ def get_git_revision_hash(short=True):
     gitcmd = ['git', '-C', aubio_dir, 'diff-index', '--quiet']
     gitcmd.append('HEAD')
     try:
-        subprocess.check_output(gitcmd).strip().decode('utf8')
-    except Exception as e:
+        output = subprocess.check_output(gitcmd)
+    except subprocess.CalledProcessError:
+        try:
+            import sys
+            sys.stdout.write('Info: current git tree is not clean\n')
+            gitstatus = subprocess.check_output(['git', 'status'])
+            sys.stdout.write(gitstatus.decode('utf8'))
+        except Exception:
+            pass
         gitsha += '+mods'
     return gitsha