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 1STgZn-0000PE-Ub for garchives@archives.gentoo.org; Sun, 13 May 2012 21:43:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4792E0602; Sun, 13 May 2012 21:43:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 77BF9E0602 for ; Sun, 13 May 2012 21:43:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1C1E1B405A for ; Sun, 13 May 2012 21:43:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6CC70E5429 for ; Sun, 13 May 2012 21:43:30 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1336945401.9007f3699d8ca63d800340e9c269b4d4233f4866.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9007f3699d8ca63d800340e9c269b4d4233f4866 X-VCS-Branch: master Date: Sun, 13 May 2012 21:43:30 +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: 087dea0a-0329-4953-8462-a4a7d7840e4a X-Archives-Hash: 2f3e78529e712933052f9c08e1a6a40c commit: 9007f3699d8ca63d800340e9c269b4d4233f4866 Author: Zac Medico gentoo org> AuthorDate: Sun May 13 21:43:21 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 13 21:43:21 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9007f369 repoman: simplify ebuild sort code --- bin/repoman | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/bin/repoman b/bin/repoman index 3d1a4b0..1fc9acc 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1347,17 +1347,6 @@ for x in effective_scanlist: pkgs[pf] =3D Package(cpv=3Dcpv, metadata=3Dmyaux, root_config=3Droot_config, type_name=3D"ebuild") =20 - # Sort ebuilds in ascending order for the KEYWORDS.dropped check. - pkgsplits =3D {} - for i in range(len(ebuildlist)): - ebuild_split =3D portage.pkgsplit(ebuildlist[i]) - pkgsplits[ebuild_split] =3D ebuildlist[i] - ebuildlist[i] =3D ebuild_split - ebuildlist.sort(key=3Dcmp_sort_key(portage.pkgcmp)) - for i in range(len(ebuildlist)): - ebuildlist[i] =3D pkgsplits[ebuildlist[i]] - del pkgsplits - slot_keywords =3D {} =20 if len(pkgs) !=3D len(ebuildlist): @@ -1369,6 +1358,10 @@ for x in effective_scanlist: can_force =3D False continue =20 + # Sort ebuilds in ascending order for the KEYWORDS.dropped check. + ebuildlist =3D sorted(pkgs.values()) + ebuildlist =3D [pkg.pf for pkg in ebuildlist] + for y in checkdirlist: m =3D disallowed_filename_chars_re.search(y.strip(os.sep)) if m is not None: