From c37319fac1e0ff59930ab3ff3bd468b27a5a1346 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 Apr 2010 14:11:47 -0700 Subject: Make cpv_getversion handle invalid cpv and add cpv_getversion to __all__. --- pym/portage/versions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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): -- cgit v1.2.3-1-g7c22