[gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/paludispm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     749f517175ff0da8325c8b3d7b8eeab78a1f91ca
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 09:28:36 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 09:28:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=749f5171

Reuse key/version comparisons.

---
 gentoopm/paludispm/pkg.py |    4 ++--
 gentoopm/portagepm/pkg.py |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py
index 4af56c8..1c3fb6e 100644
--- a/gentoopm/paludispm/pkg.py
+++ b/gentoopm/paludispm/pkg.py
@@ -104,8 +104,8 @@ class PaludisID(PMPackage, PaludisAtom):
 		if not isinstance(other, PaludisID):
 			raise TypeError('Unable to compare %s against %s' % \
 					self, other)
-		return str(self.key) < str(other.key) \
-				or self._pkg.version < other._pkg.version \
+		return self.key < other.key \
+				or self.version < other.version \
 				or self._env.more_important_than( \
 						other.repository, self.repository)
 

diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py
index 49e4b8e..a26bb45 100644
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@ -124,8 +124,7 @@ class PortageDBCPV(PMPackage, CompletePortageAtom):
 		if not isinstance(other, PortageDBCPV):
 			raise TypeError('Unable to compare %s against %s' % \
 					(self, other))
-		return cpv_getkey(self._cpv) < cpv_getkey(other._cpv) \
-				or vercmp(cpv_getversion(self._cpv), cpv_getversion(other._cpv)) < 0
+		return self.key < other.key or self.version < other.version
 
 class PortageCPV(PortageDBCPV, PMInstallablePackage):
 	def __init__(self, cpv, dbapi, tree, repo_prio):
@@ -156,8 +155,7 @@ class PortageCPV(PortageDBCPV, PMInstallablePackage):
 		if not isinstance(other, PortageCPV):
 			raise TypeError('Unable to compare %s against %s' % \
 					(self, other))
-		return cpv_getkey(self._cpv) < cpv_getkey(other._cpv) \
-				or vercmp(cpv_getversion(self._cpv), cpv_getversion(other._cpv)) < 0 \
+		return self.key < other.key or self.version < other.version \
 				or self._repo_prio < other._repo_prio
 
 class PortageVDBCPV(PortageDBCPV, PMInstalledPackage):