From: Martin Hermant <martin.hermant@gmail.com>
Date: Thu, 16 Mar 2017 17:47:26 +0000 (+0100)
Subject: this_version.py : * fix : get_aubio_version : remove ‘.’ before ~git * fix typo ... 
X-Git-Tag: 0.4.5~45^2~21
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=c6c20bedb19c749b0079dde002eca818a7edf46a;p=aubio.git

this_version.py : * fix : get_aubio_version : remove ‘.’ before ~git * fix typo : check ~alpha in version status
---

diff --git a/this_version.py b/this_version.py
index c1ce4228..d8352e64 100644
--- a/this_version.py
+++ b/this_version.py
@@ -66,11 +66,11 @@ def get_libaubio_version():
 
 
 def get_aubio_version(add_status=True):
-    # return string formatted as MAJ.MIN.PATCH.{~git<sha> , ''}
+    # return string formatted as MAJ.MIN.PATCH{~git<sha> , ''}
     vdict = get_version_info()
     verstr = '%s.%s.%s' % get_aubio_version_tuple()
     if add_status and vdict['AUBIO_VERSION_STATUS']:
-        verstr += "." + vdict['AUBIO_VERSION_STATUS']
+        verstr += vdict['AUBIO_VERSION_STATUS']
     return verstr
 
 
@@ -83,7 +83,7 @@ def get_aubio_pyversion(add_status=True):
     if add_status and vdict['AUBIO_VERSION_STATUS']:
         if '~git' in vdict['AUBIO_VERSION_STATUS']:
             verstr += "+a0." + vdict['AUBIO_VERSION_STATUS'][1:]
-        elif '~alpha':
+        elif '~alpha' in vdict['AUBIO_VERSION_STATUS']:
             verstr += "+a0"
         else:
             raise SystemError("Aubio version statut not supported : %s" %