From 6d3000ef4b52ead1f60dfee273f5e86ce8547d19 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Mon, 9 Jan 2012 13:50:55 +0200 Subject: [PATCH] pkgloader: better version number cleanup --- python/pkgloader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/pkgloader.py b/python/pkgloader.py index a70cb1c3..c371694d 100644 --- a/python/pkgloader.py +++ b/python/pkgloader.py @@ -70,7 +70,10 @@ def require(pkg, reqver): # check if it is actually useful ver_str = mod.__version__ - ver_str = ver_str.split('-', 1)[0] + for i, c in enumerate(ver_str): + if c != '.' and not c.isdigit(): + ver_str = ver_str[:i] + break full_ver = tuple([int(x) for x in ver_str.split('.')]) if full_ver[0] != reqval[0] or reqval > full_ver: raise ImportError("Request for package '%s' ver '%s', have '%s'" % ( -- 2.39.5