Mercurial > hg > truffle

changeset 8391:d1d486c03e8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix version parsing in mx
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 19 Mar 2013 14:55:58 +0100
parents acc24060b64f
children 39b37e601242
files mxtool/mx.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Mon Mar 18 14:45:36 2013 +0100
+++ b/mxtool/mx.py	Tue Mar 19 14:55:58 2013 +0100
@@ -1061,11 +1061,11 @@
 class JavaVersion:
     def __init__(self, versionString):
         validChar = '[\x21-\x25\x27-\x29\x2c\x2f-\x5e\x60-\x7f]'
-        separator = '[.-_]'
+        separator = '[.\-_]'
         m = re.match(validChar + '+(' + separator + validChar + '+)*', versionString)
         assert m is not None, 'not a recognized version string: ' + versionString
         self.versionString = versionString;
-        self.parts = versionString.split(separator)
+        self.parts = [int(f) if f.isdigit() else f for f in re.split(separator, versionString)]
         
     def __str__(self):
         return self.versionString