diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-04-10 14:11:47 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-04-10 14:11:47 -0700 |
commit | c37319fac1e0ff59930ab3ff3bd468b27a5a1346 (patch) | |
tree | 4fe34dd2fdf66bd1959190dbc01f3a4f9d73ddcf | |
parent | 2339fbb2fc4f54161787afebb768d60afc3511ba (diff) | |
download | portage-c37319fac1e0ff59930ab3ff3bd468b27a5a1346.tar.gz portage-c37319fac1e0ff59930ab3ff3bd468b27a5a1346.tar.bz2 portage-c37319fac1e0ff59930ab3ff3bd468b27a5a1346.zip |
Make cpv_getversion handle invalid cpv and add cpv_getversion to __all__.
-rw-r--r-- | pym/portage/versions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/versions.py b/pym/portage/versions.py index 89ab6e180..1db421a7e 100644 --- a/pym/portage/versions.py +++ b/pym/portage/versions.py @@ -4,7 +4,7 @@ __all__ = [ 'best', 'catpkgsplit', 'catsplit', - 'cpv_getkey', 'pkgcmp', 'pkgsplit', + 'cpv_getkey', 'cpv_getversion', 'pkgcmp', 'pkgsplit', 'ververify', 'vercmp' ] @@ -338,6 +338,8 @@ def cpv_getkey(mycpv): def cpv_getversion(mycpv): """Returns the v (including revision) from an cpv.""" cp = cpv_getkey(mycpv) + if cp is None: + return None return mycpv[len(cp+"-"):] def catsplit(mydep): |