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

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

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

Support comparing PMPackageVersions.

---
 gentoopm/basepm/atom.py    |    4 ++++
 gentoopm/paludispm/atom.py |    3 +++
 gentoopm/pkgcorepm/atom.py |    8 ++++++++
 gentoopm/portagepm/atom.py |    5 ++++-
 4 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/gentoopm/basepm/atom.py b/gentoopm/basepm/atom.py
index b37b46f..9fa2c39 100644
--- a/gentoopm/basepm/atom.py
+++ b/gentoopm/basepm/atom.py
@@ -93,6 +93,10 @@ class PMPackageVersion(ABCObject, StringCompat):
 		"""
 		pass
 
+	@abstractmethod
+	def __lt__(self, other):
+		pass
+
 class PMAtom(ABCObject, StringifiedComparisons):
 	"""
 	A base class for PM-specific atom (dependency specification).

diff --git a/gentoopm/paludispm/atom.py b/gentoopm/paludispm/atom.py
index 3b54de3..c416cb1 100644
--- a/gentoopm/paludispm/atom.py
+++ b/gentoopm/paludispm/atom.py
@@ -51,6 +51,9 @@ class PaludisPackageVersion(PMPackageVersion):
 	def __str__(self):
 		return str(self._v)
 
+	def __lt__(self, other):
+		return self._v < other._v
+
 class PaludisAtom(PMAtom):
 	def _init_atom(self, s, env, wildcards = False):
 		opts = paludis.UserPackageDepSpecOptions() \

diff --git a/gentoopm/pkgcorepm/atom.py b/gentoopm/pkgcorepm/atom.py
index c903131..698864e 100644
--- a/gentoopm/pkgcorepm/atom.py
+++ b/gentoopm/pkgcorepm/atom.py
@@ -67,6 +67,11 @@ class PkgCorePackageVersion(PMPackageVersion):
 	def __str__(self):
 		return self._atom.fullver
 
+	def __lt__(self, other):
+		if self._atom.key != other._atom.key:
+			raise NotImplementedError('Unable to compare versions of distinct packages')
+		return self._atom < other._atom
+
 class PkgCoreIncompletePackageVersion(PMPackageVersion):
 	def __init__(self, r):
 		self._r = _find_res(r, VersionMatch)
@@ -81,6 +86,9 @@ class PkgCoreIncompletePackageVersion(PMPackageVersion):
 	def revision(self):
 		return self._r.rev or 0
 
+	def __lt__(self, other):
+		raise NotImplementedError('Unable to compare versions of incomplete atoms')
+
 	def __str__(self):
 		# XXX: ugly?
 		return str(self._r).split()[-1]

diff --git a/gentoopm/portagepm/atom.py b/gentoopm/portagepm/atom.py
index e893033..28b273d 100644
--- a/gentoopm/portagepm/atom.py
+++ b/gentoopm/portagepm/atom.py
@@ -8,7 +8,7 @@ import collections
 import portage.exception as pe
 from portage.dbapi.dep_expand import dep_expand
 from portage.dep import match_from_list
-from portage.versions import catsplit, pkgsplit, cpv_getversion
+from portage.versions import catsplit, pkgsplit, cpv_getversion, vercmp
 
 from gentoopm.basepm.atom import PMAtom, PMPackageKey, PMPackageVersion, \
 		PMIncompletePackageKey
@@ -49,6 +49,9 @@ class PortagePackageVersion(PMPackageVersion):
 	def __str__(self):
 		return cpv_getversion(self._cpv)
 
+	def __lt__(self, other):
+		return vercmp(str(self), str(other)) < 0
+
 class FakeSettings(object):
 	"""
 	Fake settings object, to satisfy cpv_expand().