[gentoo-commits] proj/gentoopm:master commit in: gentoopm/pkgcorepm/

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

commit:     2b23035543335ca792f9bc92be9db97ccda3a3a3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 17:53:03 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 17:53:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=2b230355

pkgcore: reimplement complete package sorting.

---
 gentoopm/pkgcorepm/pkg.py  |   10 +++++-----
 gentoopm/pkgcorepm/repo.py |    4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py
index 559a229..8407c7e 100644
--- a/gentoopm/pkgcorepm/pkg.py
+++ b/gentoopm/pkgcorepm/pkg.py
@@ -7,8 +7,9 @@ from gentoopm.basepm.metadata import PMPackageMetadata
 from gentoopm.basepm.pkg import PMPackage
 
 class PkgCorePackage(PMPackage):
-	def __init__(self, pkg):
+	def __init__(self, pkg, repo_index = 0):
 		self._pkg = pkg
+		self._repo_index = repo_index
 
 	@property
 	def metadata(self):
@@ -21,10 +22,9 @@ class PkgCorePackage(PMPackage):
 	def __cmp__(self, other):
 		if not isinstance(other, PkgCorePackage):
 			raise TypeError('Unable to compare %s against %s' % \
-					self, other)
-		if self._pkg.key != other._pkg.key:
-			raise TypeError('Unable to compare ebuilds with different PNs')
-		return self._pkg.__cmp__(other._pkg)
+					(self, other))
+		return cmp(self._pkg, other._pkg) \
+				or cmp(other._repo_index, self._repo_index)
 
 class PkgCoreMetadata(PMPackageMetadata):
 	def __init__(self, pkg):

diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py
index b0f0593..0bb1a78 100644
--- a/gentoopm/pkgcorepm/repo.py
+++ b/gentoopm/pkgcorepm/repo.py
@@ -16,12 +16,14 @@ class PkgCoreRepoDict(PMRepositoryDict):
 		self._stack = stack
 
 class PkgCoreRepository(PMRepository):
+	_index = 0
 	def __init__(self, repo_obj):
 		self._repo = repo_obj
 
 	def __iter__(self):
+		index = self._index
 		for pkg in self._repo:
-			yield PkgCorePackage(pkg)
+			yield PkgCorePackage(pkg, index)
 
 class PkgCoreEbuildRepo(PkgCoreRepository, PMEbuildRepository):
 	def __init__(self, repo_obj, index):