From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-364571-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Qk93u-0008Cr-Sm
for garchives@archives.gentoo.org; Fri, 22 Jul 2011 06:18:15 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0BF8521C02A;
Fri, 22 Jul 2011 06:18:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id BD56921C02A
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jul 2011 06:18:05 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2093C1B4011
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jul 2011 06:18:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 453118003D
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jul 2011 06:18:04 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <dbe711c989764fc0fb13200fb598c5587bd980b7.mgorny@gentoo>
Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/paludispm/
X-VCS-Repository: proj/gentoopm
X-VCS-Files: gentoopm/paludispm/pkg.py gentoopm/paludispm/repo.py
X-VCS-Directories: gentoopm/paludispm/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: dbe711c989764fc0fb13200fb598c5587bd980b7
Date: Fri, 22 Jul 2011 06:18:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: cb638cbb5427ca322f0ffabb11e35df9
commit: dbe711c989764fc0fb13200fb598c5587bd980b7
Author: Micha=C5=82 G=C3=B3rny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 06:15:19 2011 +0000
Commit: Micha=C5=82 G=C3=B3rny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 06:15:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;=
a=3Dcommit;h=3Ddbe711c9
Paludis: sort packages directly.
---
gentoopm/paludispm/pkg.py | 11 +++++------
gentoopm/paludispm/repo.py | 6 +++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py
index 557deee..4af56c8 100644
--- a/gentoopm/paludispm/pkg.py
+++ b/gentoopm/paludispm/pkg.py
@@ -38,10 +38,8 @@ class PaludisPackageDescription(PMPackageDescription):
return k.parse_value() if k is not None else None
=20
class PaludisID(PMPackage, PaludisAtom):
- def __init__(self, pkg, num =3D 0, enum_id =3D None, env =3D None):
+ def __init__(self, pkg, env):
self._pkg =3D pkg
- self._num =3D num
- self._enum_id =3D enum_id
self._env =3D env
=20
@property
@@ -106,9 +104,10 @@ class PaludisID(PMPackage, PaludisAtom):
if not isinstance(other, PaludisID):
raise TypeError('Unable to compare %s against %s' % \
self, other)
- if self._enum_id !=3D other._enum_id:
- raise TypeError('Unable to compare results of two enumerations')
- return self._num < other._num
+ return str(self.key) < str(other.key) \
+ or self._pkg.version < other._pkg.version \
+ or self._env.more_important_than( \
+ other.repository, self.repository)
=20
class PaludisInstallableID(PaludisID, PMInstallablePackage):
pass
diff --git a/gentoopm/paludispm/repo.py b/gentoopm/paludispm/repo.py
index 27419a9..1449923 100644
--- a/gentoopm/paludispm/repo.py
+++ b/gentoopm/paludispm/repo.py
@@ -43,9 +43,9 @@ class PaludisBaseRepo(PMRepository, PaludisPackageSet):
=20
def __iter__(self):
enum =3D PaludisEnumID()
- for i, p in enumerate(self._env[paludis.Selection.AllVersionsSorted(
- paludis.FilteredGenerator(self._gen, self._filt))]):
- yield self._pkg_class(p, i, enum, self._env)
+ for p in self._env[paludis.Selection.AllVersionsUnsorted(
+ paludis.FilteredGenerator(self._gen, self._filt))]:
+ yield self._pkg_class(p, self._env)
=20
def filter(self, *args, **kwargs):
pset =3D self