Changeset 115b452 for this_version.py

Timestamp:

Mar 23, 2017, 9:47:10 PM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler

Children:

cc4987a

Parents:

9189c42

Message:

this_version.py: simplify git clean check

File:

• this_version.py (modified) (1 diff)

this_version.py

@@ -85 +85 @@
         return None
     # check if we have a clean tree
-    gitcmd = ['git', '-C', aubio_dir, 'diff-index', '--quiet']
-    gitcmd.append('HEAD')
+    gitcmd = ['git', '-C', aubio_dir, 'status', '--porcelain']
     try:
-        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'
+        output = subprocess.check_output(gitcmd).decode('utf8')
+        if len(output):
+            print('Info: current tree is not clean\n')
+            print(output)
+            gitsha += '+mods'
+    except subprocess.CalledProcessError as e:
+        print (e)
+        pass
     return gitsha