Merge branch 'issue/BUG20365619' into develop

Geert Vanderkelen · Geert Vanderkelen · commit 7f103ac5ec01 · 2015-03-20T09:13:38.000+01:00
diff --git a/lib/cpy_distutils.py b/lib/cpy_distutils.py
@@ -150,7 +150,11 @@ def get_mysql_config_info(mysql_config):
     for option, line in zip(options, stdout.split('\n')):
         info[option] = line.strip()
 
-    info['version'] = tuple([int(v) for v in info['version'].split('.')[0:3]])
+    ver = info['version']
+    if '-' in ver:
+        ver, _ = ver.split('-', 2)
+
+    info['version'] = tuple([int(v) for v in ver.split('.')[0:3]])
     libs = shlex.split(info['libs'])
     info['lib_dir'] = libs[0].replace('-L', '')
     info['libs'] = [ lib.replace('-l', '') for lib in libs[1:] ]
