From ba307ef1dc5ed986fa79fe732cc8d66820a901ef Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 13 May 2012 15:30:31 -0700 Subject: _pkg_str: make version -r0 consistent with input --- pym/portage/versions.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/portage/versions.py b/pym/portage/versions.py index 50eba56bd..298b7aaca 100644 --- a/pym/portage/versions.py +++ b/pym/portage/versions.py @@ -338,7 +338,10 @@ class _pkg_str(_unicode): if self.cpv_split is None: raise InvalidData(cpv) self.__dict__['cp'] = self.cpv_split[0] + '/' + self.cpv_split[1] - self.__dict__['version'] = "-".join(self.cpv_split[2:]) + if self.cpv_split[-1] == "r0" and cpv[-3:] != "-r0": + self.__dict__['version'] = "-".join(self.cpv_split[2:-1]) + else: + self.__dict__['version'] = "-".join(self.cpv_split[2:]) # for match_from_list introspection self.__dict__['cpv'] = self if slot is not None: -- cgit v1.2.3-1-g7c22