Changeset b201912 for this_version.py

Timestamp:

Apr 11, 2017, 1:49:44 AM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

04d0c89

Parents:

fbafd2c (diff), b762f8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sampler

Fixed conflicts:

python/lib/gen_external.py
src/io/source_avcodec.c

File:

• this_version.py (modified) (3 diffs)

this_version.py

@@ -1 +1 @@
 #! python
 import os
+import sys
 
 __version_info = {} # keep a reference to parse VERSION once
@@ -82 +83 @@
         gitsha = subprocess.check_output(gitcmd).strip().decode('utf8')
     except Exception as e:
-        print('git command error :%s' % e)
+        sys.stderr.write('git command error :%s\n' % e)
         return None
     # check if we have a clean tree
@@ -89 +90 @@
         output = subprocess.check_output(gitcmd).decode('utf8')
         if len(output):
-            print('Info: current tree is not clean\n')
-            print(output)
+            sys.stderr.write('Info: current tree is not clean\n\n')
+            sys.stderr.write(output + '\n')
             gitsha += '+mods'
     except subprocess.CalledProcessError as e:
-        print (e)
+        sys.stderr.write('git command error :%s\n' % e)
         pass
     return gitsha
 
 if __name__ == '__main__':
-    print ('%30s'% 'aubio version:', get_aubio_version())
-    print ('%30s'% 'python-aubio version:', get_aubio_pyversion())
+    if len(sys.argv) > 1 and sys.argv[1] == '-v':
+        print (get_aubio_version())
+    elif len(sys.argv) > 1 and sys.argv[1] == '-p':
+        print (get_aubio_version())
+    else:
+        print ('%30s'% 'aubio version:', get_aubio_version())
+        print ('%30s'% 'python-aubio version:', get_aubio_pyversion())