summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-10-13 19:44:18 -0700
committerZac Medico <zmedico@gentoo.org>2012-10-13 19:44:18 -0700
commit6d6868206d5109fbbda9b716b597adb3440666bb (patch)
tree2f9f362faf15b5fcc29f2d52d0a2b5b53fd482bb
parentb7b906fdf49a55621a12798ae21d603d9ca4eb76 (diff)
downloadportage-6d6868206d5109fbbda9b716b597adb3440666bb.tar.gz
portage-6d6868206d5109fbbda9b716b597adb3440666bb.tar.bz2
portage-6d6868206d5109fbbda9b716b597adb3440666bb.zip
Simplify Display.get_ver_str().
-rw-r--r--pym/_emerge/resolver/output.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 6ae022e00..8a1e63ae5 100644
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -676,12 +676,10 @@ class Display(object):
@param pkg: _emerge.Package.Package instance
@rtype string
"""
- ver_str = list(catpkgsplit(pkg.cpv)[2:])
- if ver_str[1] == "r0":
- ver_str[1] = ""
- else:
- ver_str[1] = "-" + ver_str[1]
- return ver_str[0]+ver_str[1]
+ ver_str = pkg.cpv.version
+ if ver_str.endswith("-r0"):
+ ver_str = ver_str[:-3]
+ return ver_str
def _get_installed_best(self, pkg, pkg_info):