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 1LhFF5-0004nv-4L for garchives@archives.gentoo.org; Wed, 11 Mar 2009 03:36:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C532E03C6; Wed, 11 Mar 2009 03:36:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 74503E03C6 for ; Wed, 11 Mar 2009 03:36:26 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id A4D31646C1 for ; Wed, 11 Mar 2009 03:36:25 +0000 (UTC) Received: from zmedico by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LhFF3-00031K-Et for gentoo-commits@lists.gentoo.org; Wed, 11 Mar 2009 03:36:25 +0000 To: gentoo-commits@lists.gentoo.org From: "Zac Medico (zmedico)" Subject: [gentoo-commits] portage r12855 - main/branches/2.1.6/pym/_emerge X-VCS-Repository: portage X-VCS-Revision: 12855 X-VCS-Files: main/branches/2.1.6/pym/_emerge/__init__.py X-VCS-Directories: main/branches/2.1.6/pym/_emerge X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico Content-Type: text/plain; charset=UTF-8 Message-Id: Sender: Zac Medico Date: Wed, 11 Mar 2009 03:36:25 +0000 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: a6b9c3da-9af8-4790-b653-10e874621d93 X-Archives-Hash: f2631c34ad75c8fd92818b7e7dcbbc35 Author: zmedico Date: 2009-03-11 03:36:24 +0000 (Wed, 11 Mar 2009) New Revision: 12855 Modified: main/branches/2.1.6/pym/_emerge/__init__.py Log: Use portage.util.cmp_sort_key for python-3.0 compatibility. (trunk r12574= ) Modified: main/branches/2.1.6/pym/_emerge/__init__.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- main/branches/2.1.6/pym/_emerge/__init__.py 2009-03-11 03:36:10 UTC (= rev 12854) +++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-03-11 03:36:24 UTC (= rev 12855) @@ -51,7 +51,7 @@ from portage.data import secpass from portage.elog.messages import eerror from portage.util import normalize_path as normpath -from portage.util import writemsg, writemsg_level +from portage.util import cmp_sort_key, writemsg, writemsg_level from portage._sets import load_default_config, SETPREFIX from portage._sets.base import InternalPackageSet =20 @@ -6663,7 +6663,7 @@ node_info[node] =3D len(mygraph.parent_nodes(node)) def cmp_merge_preference(node1, node2): return node_info[node2] - node_info[node1] - mygraph.order.sort(cmp_merge_preference) + mygraph.order.sort(key=3Dcmp_sort_key(cmp_merge_preference)) =20 def altlist(self, reversed=3DFalse): =20 @@ -7004,7 +7004,7 @@ if selected_nodes and len(selected_nodes) > 1: if not isinstance(selected_nodes, list): selected_nodes =3D list(selected_nodes) - selected_nodes.sort(cmp_circular_bias) + selected_nodes.sort(key=3Dcmp_sort_key(cmp_circular_bias)) =20 if not selected_nodes and not myblocker_uninstalls.is_empty(): # An Uninstall task needs to be executed in order to @@ -11567,7 +11567,7 @@ writemsg_level((mytype + ": ").rjust(14), noiselevel=3D-1) if pkgmap[x][mytype]: sorted_pkgs =3D [portage.catpkgsplit(mypkg)[1:] for mypkg in pkgmap[= x][mytype]] - sorted_pkgs.sort(portage.pkgcmp) + sorted_pkgs.sort(key=3Dcmp_sort_key(portage.pkgcmp)) for pn, ver, rev in sorted_pkgs: if rev =3D=3D "r0": myversion =3D ver @@ -12807,7 +12807,7 @@ if portage.isvalidatom(x): pkg_matches =3D trees["/"]["vartree"].dbapi.match(x) pkg_matches =3D [portage.catpkgsplit(cpv)[1:] for cpv in pkg_matches] - pkg_matches.sort(portage.pkgcmp) + pkg_matches.sort(key=3Dcmp_sort_key(portage.pkgcmp)) pkgs =3D [] for pn, ver, rev in pkg_matches: if rev !=3D "r0": @@ -13356,7 +13356,7 @@ node_refcounts[node] =3D len(graph.parent_nodes(node)) def cmp_reference_count(node1, node2): return node_refcounts[node1] - node_refcounts[node2] - graph.order.sort(cmp_reference_count) + graph.order.sort(key=3Dcmp_sort_key(cmp_reference_count)) =09 ignore_priority_range =3D [None] ignore_priority_range.extend(