projects
/
skytools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f8b05cd
)
pkgloader: better version number cleanup
author
Marko Kreen
<markokr@gmail.com>
Mon, 9 Jan 2012 11:50:55 +0000
(13:50 +0200)
committer
Marko Kreen
<markokr@gmail.com>
Mon, 9 Jan 2012 11:50:55 +0000
(13:50 +0200)
python/pkgloader.py
patch
|
blob
|
blame
|
history
diff --git
a/python/pkgloader.py
b/python/pkgloader.py
index a70cb1c31cae9f9de80a7fa95c66a153f172985d..c371694dd3e4119eee62777259308c0b7e3edd77 100644
(file)
--- 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'" % (