diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-04 21:57:34 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-04 21:57:34 +0300 |
| commit | fd78c5a128460c88631b50b3c22a48d7675c9bc1 (patch) | |
| tree | 7bdc610ded338750cb1d237aaabf344d53cf217f | |
| parent | 3bcb402b3c1419d78759b6980a3a2af0908251ee (diff) | |
| download | meson-fd78c5a128460c88631b50b3c22a48d7675c9bc1.zip meson-fd78c5a128460c88631b50b3c22a48d7675c9bc1.tar.gz meson-fd78c5a128460c88631b50b3c22a48d7675c9bc1.tar.bz2 | |
Drop non-numeric suffix in version numbers. Closes #258.
| -rw-r--r-- | mesonlib.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesonlib.py b/mesonlib.py index 76fb792..d199725 100644 --- a/mesonlib.py +++ b/mesonlib.py @@ -113,9 +113,13 @@ def detect_vcs(source_dir): return vcs return None +numpart = re.compile('[0-9.]+') + def version_compare(vstr1, vstr2): - if '-' in vstr1: - vstr1 = vstr1.split('-')[0] + match = numpart.match(vstr1.strip()) + if match is None: + raise MesonException('Unconparable version string %s.' % vstr1) + vstr1 = match.group(0) if vstr2.startswith('>='): cmpop = operator.ge vstr2 = vstr2[2:] |