diff options
| author | Marko Kreen | 2009-11-03 12:19:22 +0000 |
|---|---|---|
| committer | Marko Kreen | 2009-11-03 12:43:44 +0000 |
| commit | 14dabdc95bc7bf507d8b8f18ad9163f07baa2d73 (patch) | |
| tree | 6b570c2d9078a80d21358320f4f7aa0c48a4796e | |
| parent | 2b47b1c8f031f139dc038d60ff335d33636106bf (diff) | |
pkgloader: allow non-numerics after '-'
Clean up few veriable names also
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | python/pkgloader.py | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index a2e24e41..5ac87f79 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(skytools, 3.0git) +AC_INIT(skytools, 3.0-git) AC_CONFIG_SRCDIR(python/pgqadm.py) AC_CONFIG_HEADER(lib/usual/config.h) AC_PREREQ([2.59]) diff --git a/python/pkgloader.py b/python/pkgloader.py index 940defe5..f27b3571 100644 --- a/python/pkgloader.py +++ b/python/pkgloader.py @@ -49,15 +49,15 @@ def require(pkg, reqver): got = _import_cache[pkg] if need[0] != got[0] or reqval > got: raise ImportError("Request for package '%s' ver '%s', have '%s'" % ( - pkg, reqver, '.'.join(_skytools_required_version))) + pkg, reqver, '.'.join(got))) return # pick best ver from available ones - _pkg_cache = _load_pkg_cache() - if pkg not in _pkg_cache: + cache = _load_pkg_cache() + if pkg not in cache: return - for pkgver, pkgdir in _pkg_cache[pkg]: + for pkgver, pkgdir in cache[pkg]: if pkgver[0] == need[0] and pkgver >= need: # install the best on _install_path(pkg, os.path.join(_top, pkgdir)) @@ -69,12 +69,13 @@ def require(pkg, reqver): mod = __import__(pkg) ver_str = mod.__version__ # check if it is actually useful + ver_str = ver_str.split('-', 1)[0] 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 Skytools ver '%s', got '%s'" % ( - reqver, full_str)) + reqver, '.'.join(full_ver))) raise ImportError("Request for package '%s' ver '%s', have '%s'" % ( - pkg, reqver, full_str)) + pkg, reqver, '.'.join(full_ver))) inst_ver = full_ver except ImportError: pass |