From 84456537da9a77bbfe4fe9027c9fb36111c6b38d Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Sat, 16 Jan 2016 20:59:34 +0200
Subject: Fix some issues that break pypi installs and bump version to upload
 new version.

---
 mesonbuild/mesonlib.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'mesonbuild/mesonlib.py')

diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index 2ab5ce4..a814567 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -116,6 +116,15 @@ def detect_vcs(source_dir):
                 return vcs
     return None
 
+def grab_leading_numbers(vstr):
+    result = []
+    for x in vstr.split('.'):
+        try:
+            result.append(int(x))
+        except ValueError:
+            break
+    return result
+
 numpart = re.compile('[0-9.]+')
 
 def version_compare(vstr1, vstr2):
@@ -146,8 +155,8 @@ def version_compare(vstr1, vstr2):
         vstr2 = vstr2[1:]
     else:
         cmpop = operator.eq
-    varr1 = [int(x) for x in vstr1.split('.')]
-    varr2 = [int(x) for x in vstr2.split('.')]
+    varr1 = grab_leading_numbers(vstr1)
+    varr2 = grab_leading_numbers(vstr2)
     return cmpop(varr1, varr2)
 
 def default_libdir():
-- 
cgit v1.1