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 ) id 1QkYVJ-0001p2-GU for garchives@archives.gentoo.org; Sat, 23 Jul 2011 09:28:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B5B421C080; Sat, 23 Jul 2011 09:27:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3C94F21C080 for ; Sat, 23 Jul 2011 09:27:46 +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 B1F981B4029 for ; Sat, 23 Jul 2011 09:27:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EAB7B80056 for ; Sat, 23 Jul 2011 09:27:44 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <749f517175ff0da8325c8b3d7b8eeab78a1f91ca.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/paludispm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/paludispm/pkg.py gentoopm/portagepm/pkg.py X-VCS-Directories: gentoopm/portagepm/ gentoopm/paludispm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 749f517175ff0da8325c8b3d7b8eeab78a1f91ca Date: Sat, 23 Jul 2011 09:27:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: aceafc97402384be319156bbd4fe1396 commit: 749f517175ff0da8325c8b3d7b8eeab78a1f91ca Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sat Jul 23 09:28:36 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sat Jul 23 09:28:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D749f5171 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) =20 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 =20 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 =20 class PortageVDBCPV(PortageDBCPV, PMInstalledPackage):