From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 13 May 2012 22:30:31 +0000 (-0700)
Subject: _pkg_str: make version -r0 consistent with input
X-Git-Tag: v2.2.0_alpha105~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba307ef1dc5ed986fa79fe732cc8d66820a901ef;p=portage.git

_pkg_str: make version -r0 consistent with input
---

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: