this_version.py: show status if tree is not clean
authorPaul Brossier <piem@piem.org>
Thu, 23 Mar 2017 18:45:41 +0000 (19:45 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 23 Mar 2017 18:45:41 +0000 (19:45 +0100)
this_version.py

index 69d2f56..7674ef7 100644 (file)
@@ -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